Merge pull request #205 from sevajide/fix-install-aliases-on-pypy

Fixes standard_library.install_aliases() on pypy

Author: edschofield

src/future/types/newbytes.py

@@ -29,6 +29,13 @@ def __instancecheck__(cls, instance):
             return issubclass(instance.__class__, cls)
 
 
+def _newchr(x):
+    if isinstance(x, str):  # this happens on pypy
+        return x.encode('ascii')
+    else:
+        return chr(x)
+
+
 class newbytes(with_metaclass(BaseNewBytes, _builtin_bytes)):
     """
     A backport of the Python 3 bytes object to Py2
@@ -42,14 +49,14 @@ def __new__(cls, *args, **kwargs):
         bytes(bytes_or_buffer) -> immutable copy of bytes_or_buffer
         bytes(int) -> bytes object of size given by the parameter initialized with null bytes
         bytes() -> empty bytes object
-        
+
         Construct an immutable array of bytes from:
           - an iterable yielding integers in range(256)
           - a text string encoded using the specified encoding
           - any object implementing the buffer API.
           - an integer
         """
-        
+
         encoding = None
         errors = None
 
@@ -91,7 +98,7 @@ def __new__(cls, *args, **kwargs):
             if errors is not None:
                 newargs.append(errors)
             value = args[0].encode(*newargs)
-            ### 
+            ###
         elif isinstance(args[0], Iterable):
             if len(args[0]) == 0:
                 # This could be an empty list or tuple. Return b'' as on Py3.
@@ -102,8 +109,7 @@ def __new__(cls, *args, **kwargs):
                 # But then we can't index into e.g. frozensets. Try to proceed
                 # anyway.
                 try:
-                    values = [chr(x) for x in args[0]]
-                    value = b''.join(values)
+                    value = bytearray([_newchr(x) for x in args[0]])
                 except:
                     raise ValueError('bytes must be in range(0, 256)')
         elif isinstance(args[0], Integral):
@@ -113,7 +119,7 @@ def __new__(cls, *args, **kwargs):
         else:
             value = args[0]
         return super(newbytes, cls).__new__(cls, value)
-        
+
     def __repr__(self):
         return 'b' + super(newbytes, self).__repr__()
 
@@ -140,15 +146,15 @@ def __contains__(self, key):
         else:
             newbyteskey = newbytes(key)
         return issubset(list(newbyteskey), list(self))
-    
+
     @no(unicode)
     def __add__(self, other):
         return newbytes(super(newbytes, self).__add__(other))
 
     @no(unicode)
     def __radd__(self, left):
         return newbytes(left) + self
-            
+
     @no(unicode)
     def __mul__(self, other):
         return newbytes(super(newbytes, self).__mul__(other))
@@ -371,32 +377,32 @@ def rstrip(self, bytes_to_strip=None):
         """
         Strip trailing bytes contained in the argument.
         If the argument is omitted, strip trailing ASCII whitespace.
-        """        
+        """
         return newbytes(super(newbytes, self).rstrip(bytes_to_strip))
 
     @no(unicode)
     def strip(self, bytes_to_strip=None):
         """
         Strip leading and trailing bytes contained in the argument.
         If the argument is omitted, strip trailing ASCII whitespace.
-        """        
+        """
         return newbytes(super(newbytes, self).strip(bytes_to_strip))
 
     def lower(self):
         """
         b.lower() -> copy of b
-        
+
         Return a copy of b with all ASCII characters converted to lowercase.
-        """        
+        """
         return newbytes(super(newbytes, self).lower())
 
     @no(unicode)
     def upper(self):
         """
         b.upper() -> copy of b
-        
+
         Return a copy of b with all ASCII characters converted to uppercase.
-        """        
+        """
         return newbytes(super(newbytes, self).upper())
 
     @classmethod