Changeset 44

Timestamp:

04/11/13 16:55:05 (12 years ago)

Author:

tmorgan

Message:

fixes for percent decoder

File:

• trunk/lib/bletchley/blobtools.py (modified) (4 diffs)

trunk/lib/bletchley/blobtools.py

@@ -21 +21 @@
 import base64
 import binascii
+import traceback
 import fractions
 import operator
@@ -48 +49 @@
 
 def _percentDecode(binary, plus=False):
-    ret_val = b''
     if plus:
         binary = binary.replace(b'+', b' ')
@@ -54 +54 @@
         return b''
     chunks = binary.split(b'%')
-    if binary[0] == 0x25:
-        chunks = chunks[1:]
-
-    for chunk in chunks:
+
+    ret_val = chunks[0]
+    for chunk in chunks[1:]:
         if len(chunk) < 2:
             return None
@@ -63 +62 @@
             ret_val += bytes([int(chunk[0:2], 16)]) + chunk[2:]
         except:
-            print(repr(chunk))
+            #traceback.print_exc()
+            #print(repr(chunk), repr(binary))
             return None