r422 - in /debtorrent/trunk: DebTorrent/BT1/makemetafile.py debian/changelog

[camrdale at users.alioth.debian.org]

Author: camrdale
Date: Sun Mar 21 02:42:51 2010
New Revision: 422

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=422
Log:
Fix for the unicode strings now returned by python-debian (Closes: #574772)

Modified:
    debtorrent/trunk/DebTorrent/BT1/makemetafile.py
    debtorrent/trunk/debian/changelog

Modified: debtorrent/trunk/DebTorrent/BT1/makemetafile.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/makemetafile.py?rev=422&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/makemetafile.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/makemetafile.py Sun Mar 21 02:42:51 2010
@@ -131,10 +131,11 @@
     if not e:
         e = 'ascii'
     
-    try:
-        s = unicode(s,e)
-    except UnicodeError:
-        raise UnicodeError('bad filename: '+s)
+    if type(s) != unicode:
+        try:
+            s = unicode(s,e)
+        except UnicodeError:
+            raise UnicodeError('bad filename: '+s)
     return s.encode('utf-8')
 
 def convert_all(f):

Modified: debtorrent/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/debian/changelog?rev=422&op=diff
==============================================================================
--- debtorrent/trunk/debian/changelog (original)
+++ debtorrent/trunk/debian/changelog Sun Mar 21 02:42:51 2010
@@ -8,8 +8,9 @@
   * Add a graphical display of the pieces all peers have, thanks 
     Steve Cotton (Closes: #515771)
   * Fix bug in info page display when seeding (Closes: #524056)
+  * Fix for the unicode strings now returned by python-debian (Closes: #574772)
 
- -- Cameron Dale <camrdale at gmail.com>  Sat, 20 Mar 2010 14:51:32 -0700
+ -- Cameron Dale <camrdale at gmail.com>  Sat, 20 Mar 2010 18:33:18 -0700
 
 debtorrent (0.1.9) unstable; urgency=low