Changeset 8326206

Timestamp:

06/08/2017 10:25:11 AM (8 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Branches:

2.0.x, develop, master

Children:

bdb3b5

Parents:

85a1e4

git-author:

Calum Lind <calumlind+deluge@gmail.com> (03/17/2017 11:31:32 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (06/08/2017 10:25:11 AM)

Message:

Ensure configmanager config dir path is unicode

Location:

deluge

Files:

• common.py (modified) (1 diff)
• configmanager.py (modified) (1 diff)

deluge/common.py

@@ -110 +110 @@
         filename = ''
     try:
-        return os.path.join(save_config_path('deluge'), filename)
+        return decode_bytes(os.path.join(save_config_path('deluge'), filename))
     except OSError as ex:
         log.error('Unable to use default config directory, exiting... (%s)', ex)

deluge/configmanager.py

@@ -112 +112 @@
 def set_config_dir(directory):
     """Sets the config directory, else just uses default"""
-    return _configmanager.set_config_dir(directory)
+    return _configmanager.set_config_dir(deluge.common.decode_bytes(directory))