[pypy-svn] r10022 - pypy/dist/pypy/lib

[briandorsey at codespeak.net]

Author: briandorsey
Date: Mon Mar 21 21:22:32 2005
New Revision: 10022

Modified:
   pypy/dist/pypy/lib/binascii.py
Log:
binascii.py - the test_uu tests now pass. 



Modified: pypy/dist/pypy/lib/binascii.py
==============================================================================
--- pypy/dist/pypy/lib/binascii.py	(original)
+++ pypy/dist/pypy/lib/binascii.py	Mon Mar 21 21:22:32 2005
@@ -5,28 +5,31 @@
     pass
 
 def a2b_uu(s):
-    length = ord(s[0]) - 0x20
-    a = quadruplets(s[1:])
-    '''
-    for A, B, C, D in a:
-        print chr((A - 0x20) << 2 | (((B - 0x20) >> 4) & 0x3))
-        print chr(((B - 0x20) & 0xF) << 4 | (((C - 0x20) >> 2) & 0xF))
-        print chr(((C - 0x20) & 0x3) << 6 | ((D - 0x20) & 0x3F))
-    '''
-
-    result = [''.join(
-        [chr((A - 0x20) << 2 | (((B - 0x20) >> 4) & 0x3)),
-         chr(((B - 0x20) & 0xF) << 4 | (((C - 0x20) >> 2) & 0xF)),
-         chr(((C - 0x20) & 0x3) << 6 | ((D - 0x20) & 0x3F))
-        ]) for A, B, C, D in a]
-    return ''.join(result)[:length]
+    length = (ord(s[0]) - 0x20) % 64
+    a = quadruplets(s[1:].rstrip())
+    try:
+        result = [''.join(
+            [chr((A - 0x20) << 2 | (((B - 0x20) >> 4) & 0x3)),
+            chr(((B - 0x20) & 0xF) << 4 | (((C - 0x20) >> 2) & 0xF)),
+            chr(((C - 0x20) & 0x3) << 6 | ((D - 0x20) & 0x3F))
+            ]) for A, B, C, D in a]
+    except ValueError:
+        raise Error, 'Illegal char'
+    result = ''.join(result)
+    trailingdata = result[length:]
+    if trailingdata.strip('\x00'):
+        raise Error, 'Trailing garbage'
+    result = result[:length]
+    if len(result) < length:
+        result += ((length - len(result)) * '\x00')
+    return result
 
 def quadruplets(s):
     while s:
         try:
             a, b, c, d = s[0], s[1], s[2], s[3]
         except IndexError:
-            s += '\0\0\0'
+            s += '   '
             yield ord(s[0]), ord(s[1]), ord(s[2]), ord(s[3])
             return
         s = s[4:]
@@ -43,7 +46,7 @@
          chr(0x20 + (((A << 4) | ((B >> 4) & 0xF)) & 0x3F)),
          chr(0x20 + (((B << 2) | ((C >> 6) & 0x3)) & 0x3F)),
          chr(0x20 + (( C                         ) & 0x3F))]) for A, B, C in a]
-    return chr(ord(' ') + (length & 077)) + ''.join(result) + '\\n'
+    return chr(ord(' ') + (length & 077)) + ''.join(result) + '\n'
 
 def triples(s):
     while s:
@@ -56,9 +59,9 @@
         s = s[3:]
         yield ord(a), ord(b), ord(c)
 
-print b2a_uu('1234567')
-print b2a_uu('123456789012345678901234567890123456789012345')
+#print b2a_uu('1234567')
+#print b2a_uu('123456789012345678901234567890123456789012345')
 #print b2a_uu('1234567890123456789012345678901234567890123456')
-print '"%s"' % a2b_uu(b2a_uu('1234567'))
-print '"%s"' % a2b_uu(b2a_uu('123456789012345678901234567890123456789012345'))
+#print '"%s"' % a2b_uu(b2a_uu('1234567'))
+#print '"%s"' % a2b_uu(b2a_uu('123456789012345678901234567890123456789012345'))