r426 - in /debtorrent/trunk/DebTorrent/BT1: AptListener.py makemetafile.py

[camrdale at users.alioth.debian.org]

Author: camrdale
Date: Sun Mar 21 05:03:59 2010
New Revision: 426

URL: http://svn.debian.org/wsvn/debtorrent/?sc=1&rev=426
Log:
Convert all the unicode that now comes from python-debian back to a string

Modified:
    debtorrent/trunk/DebTorrent/BT1/AptListener.py
    debtorrent/trunk/DebTorrent/BT1/makemetafile.py

Modified: debtorrent/trunk/DebTorrent/BT1/AptListener.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/AptListener.py?rev=426&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/AptListener.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/AptListener.py Sun Mar 21 05:03:59 2010
@@ -633,15 +633,15 @@
 
         f = open(filename, 'r')
         rel = deb822.Release(f)
-        identifier = (rel.get('Origin', ''), rel.get('Label', ''))
+        identifier = (str(rel.get('Origin', '')), str(rel.get('Label', '')))
 
         # Read the Packages file names
         for file in rel.get('MD5Sum', []):
-            self.identifiers['/'.join(path[:-1]) + '/' + file['name']] = identifier
+            self.identifiers['/'.join(path[:-1]) + '/' + str(file['name'])] = identifier
         for file in rel.get('SHA1', []):
-            self.identifiers['/'.join(path[:-1]) + '/' + file['name']] = identifier
+            self.identifiers['/'.join(path[:-1]) + '/' + str(file['name'])] = identifier
         for file in rel.get('SHA256', []):
-            self.identifiers['/'.join(path[:-1]) + '/' + file['name']] = identifier
+            self.identifiers['/'.join(path[:-1]) + '/' + str(file['name'])] = identifier
         f.close()
             
     def get_package(self, connection, path, httpreq):

Modified: debtorrent/trunk/DebTorrent/BT1/makemetafile.py
URL: http://svn.debian.org/wsvn/debtorrent/debtorrent/trunk/DebTorrent/BT1/makemetafile.py?rev=426&op=diff
==============================================================================
--- debtorrent/trunk/DebTorrent/BT1/makemetafile.py (original)
+++ debtorrent/trunk/DebTorrent/BT1/makemetafile.py Sun Mar 21 05:03:59 2010
@@ -347,12 +347,12 @@
         return {}
 
     for pkg in ExtraPieces.iter_paragraphs(f):
-        if len(pkg.get('SHA1', '')) > 0 and len(pkg.get('SHA1-pieces', [])) > 0:
-            sha1 = binascii.a2b_hex(pkg['SHA1'])
+        if len(str(pkg.get('SHA1', ''))) > 0 and len(pkg.get('SHA1-pieces', [])) > 0:
+            sha1 = binascii.a2b_hex(str(pkg['SHA1']))
             pieces[sha1] = ([], [])
             for piece in pkg['SHA1-pieces']:
-                pieces[sha1][0].append(binascii.a2b_hex(piece['SHA1']))
-                pieces[sha1][1].append(int(piece['size']))
+                pieces[sha1][0].append(binascii.a2b_hex(str(piece['SHA1'])))
+                pieces[sha1][1].append(int(str(piece['size'])))
 
     try:
         f.close()
@@ -392,13 +392,13 @@
 
     tor = Torrent(f)
     for header in tor:
-        if header.lower() != 'piecenumbers':
+        if str(header.lower()) != 'piecenumbers':
             # Read the headers from the file
-            headers[header] = tor[header]
+            headers[str(header)] = str(tor[header])
             
     # Read the piece ordering data from the file
     for piece in tor['PieceNumbers']:
-        pieces[int(piece['number'])] = piece['file']
+        pieces[int(str(piece['number']))] = str(piece['file'])
             
     logger.info('successfully retrieved torrent ordering data for '+str(len(pieces))+' files')
     logger.debug('headers: %r', headers)
@@ -529,23 +529,23 @@
         if pkg.get('Size', '') and pkg.get('SHA1', '') and pkg.get('Filename', ''):
             # Check which torrent to add the info to
             all = 0
-            if (separate_all and pkg.get('Architecture', '') == 'all'):
+            if (separate_all and str(pkg.get('Architecture', '')) == 'all'):
                 all = 1
 
-            sha1 = binascii.a2b_hex(pkg['SHA1'])
+            sha1 = binascii.a2b_hex(str(pkg['SHA1']))
             if sub_pieces.has_key(sha1):
-                lengths[all][pkg['Filename']] = sub_pieces[sha1][1]
-                pieces[all][pkg['Filename']] = sub_pieces[sha1][0]
+                lengths[all][str(pkg['Filename'])] = sub_pieces[sha1][1]
+                pieces[all][str(pkg['Filename'])] = sub_pieces[sha1][0]
             else:
-                lengths[all][pkg['Filename']] = [long(pkg['Size'])]
-                pieces[all][pkg['Filename']] = [sha1]
+                lengths[all][str(pkg['Filename'])] = [long(str(pkg['Size']))]
+                pieces[all][str(pkg['Filename'])] = [sha1]
 
             path = []
-            temp = pkg['Filename']
+            temp = str(pkg['Filename'])
             while temp:
                 temp,d = split(temp)
                 path.insert(0,d)
-            fs[all][pkg['Filename']] = {'length': long(pkg['Size']), 'path': uniconvertl(path, encoding)}
+            fs[all][str(pkg['Filename'])] = {'length': long(str(pkg['Size'])), 'path': uniconvertl(path, encoding)}
             packages[all] += 1
             progress(packages[0] + packages[1])