Changeset 7d36a4

Timestamp:

02/11/2011 09:48:41 PM (14 years ago)

Author:

Calum Lind <calumlind+deluge@gmail.com>

Children:

4490cd

Parents:

6f844a

git-author:

Calum Lind <calumlind+deluge@gmail.com> (02/11/2011 09:48:00 AM)

git-committer:

Calum Lind <calumlind+deluge@gmail.com> (02/11/2011 09:48:41 PM)

Message:

Fix #1527 - Converting unicode to unicode error in move_storage

File:

• deluge/core/torrent.py (modified) (1 diff)

deluge/core/torrent.py

@@ -794 +794 @@
     def move_storage(self, dest):
         """Move a torrent's storage location"""
-        
-        # Convert path from utf8 to unicode
-        dest_u=unicode(dest,"utf-8")
-        
+
+        # Attempt to convert utf8 path to unicode
+        # Note: Inconsistent encoding for 'dest', needs future investigation
+        try:
+           dest_u = unicode(dest, "utf-8")
+        except TypeError:
+           # String is already unicode
+           dest_u = dest
+
         if not os.path.exists(dest_u):
             try: