futurize stage 2

Author: mr-c

src/bd2k/util/d32.py

@@ -18,7 +18,6 @@
 
 # Inspired by Dominic Tarr's JavaScript at https://github.com/dominictarr/d64
 
-from builtins import str
 from builtins import range
 from builtins import object
 from past.utils import old_div
@@ -109,7 +108,7 @@ def decode( self, e ):
             d[ i + 4 ] = g[ 6 ] << 5 & 255 | g[ 7 ]
             j += 8
             i += 5
-        return bytes( d[ :-padding ] )
+        return str( d[ :-padding ] )
 
 
 # A variant of Base64 that maintains the lexicographical ordering such that for any given list of

src/bd2k/util/d64.py

@@ -21,7 +21,6 @@
 
 
 
-from builtins import str
 from builtins import range
 from builtins import object
 from past.utils import old_div
@@ -116,7 +115,7 @@ def decode( self, e ):
                 j += 1
             else:
                 assert False
-        return bytes( b )
+        return str( b )
 
 
 standard = D64( '._' )

src/bd2k/util/hashes.py

@@ -61,7 +61,7 @@ def hash_json( hash_obj, value ):
     ValueError: Type <type 'object'> is not supported
     """
     try:
-        items = iter(value.items( ))
+        items = iter(list(value.items( )))
     except AttributeError:
         # Must check for string before testing iterability since strings are iterable
         if isinstance( value, basestring ):

src/bd2k/util/iterables.py

@@ -25,7 +25,7 @@ def common_prefix( xs, ys ):
     >>> list( common_prefix('A','B') )
     []
     """
-    return map( lambda x_y: x_y[0], takewhile( lambda a_b: a_b[0] == a_b[1], zip( xs, ys ) ) )
+    return [x_y[0] for x_y in takewhile( lambda a_b: a_b[0] == a_b[1], list(zip( xs, ys )) )]
 
 
 def disparate_suffix( xs, ys ):
@@ -128,7 +128,7 @@ def expand( x ):
                     i = x,
             return i
 
-        return flatten( map( expand, self.args ) )
+        return flatten( list(map( expand, self.args )) )
 
 
 # noinspection PyPep8Naming
@@ -173,4 +173,4 @@ def expand( x ):
             except AttributeError:
                 return x,
 
-        return flatten( map( expand, self.iterables ) )
+        return flatten( list(map( expand, self.iterables )) )