feelfreelinux
diff --git a/‎future/builtins/__init__.py‎
Lines changed: 2 additions & 2 deletions b/‎future/builtins/__init__.py‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎future/builtins/backports/__init__.py‎
Lines changed: 21 additions & 9 deletions b/‎future/builtins/backports/__init__.py‎
Lines changed: 21 additions & 9 deletions
@@ -14,7 +14,7 @@
 
 from future.builtins.iterators import (filter, map, zip)
 from future.builtins.misc import (ascii, oct, hex, chr, int, input, open)
-from future.builtins.backports import (round, range, super)
+from future.builtins.backports import (bytes, round, range, super)
 from future.builtins.str_is_unicode import str  
 from future import utils
 
@@ -29,7 +29,7 @@
     # Only shadow builtins on Py2; no new names
     __all__ = ['filter', 'map', 'zip', 
                'ascii', 'oct', 'hex', 'chr', 'int', 'input', 'open',
-               'round', 'range', 'super',
+               'bytes', 'round', 'range', 'super',
                'apply', 'cmp', 'coerce', 'execfile', 'file', 'long',
                'raw_input', 'reduce', 'reload', 'unicode', 'xrange',
                'str',
 
@@ -3,19 +3,30 @@
 Python 3 to Python 2.
 
 For example:
-- a Python 2 backport of the range iterator from Py3 with slicing
-  support.
+- an implementation of Python 3's bytes object (pure Python subclass of
+  Python 2's builtin 8-bit str type)
+- a backport of the range iterator from Py3 with slicing support
 - the magic zero-argument super() function
 - the new round() behaviour
 
 It is used as follows::
 
     from __future__ import division, absolute_import, print_function
-    from future.builtins.backports import range, super, round
+    from future.builtins.backports import bytes, range, super, round
 
 to bring in the new semantics for these functions from Python 3. And
 then, for example::
     
+    b = bytes(b'ABCD')
+    assert list(b) == [65, 66, 67, 68]
+    assert repr(b) == "b'ABCD'"
+    assert [65, 66] in b
+
+    # These raise TypeErrors:
+    # b + u'EFGH'
+    # b.split(u'B')
+    # bytes(b',').join([u'Fred', u'Bill'])
+
     for i in range(10**11)[:10]:
         pass
 
@@ -47,10 +58,10 @@ def append(self, item):
 Like the new ``input()`` function from Python 3 (without eval()), except
 that it returns bytes. Equivalent to Python 2's ``raw_input()``.
 
-By default, the old Python 2 input() is **removed** from ``__builtin__``
-for safety (because it may otherwise lead to shell injection on Python 2
-if used accidentally after forgetting to import the replacement for some
-reason.
+Warning: By default, importing this module *removes* the old Python 2
+input() function entirely from ``__builtin__`` for safety. This is
+because forgetting to import the new ``input`` from ``future`` might
+otherwise lead to a security vulnerability (shell injection) on Python 2.
 
 To restore it, you can retrieve it yourself from
 ``__builtin__._old_input``.
@@ -78,13 +89,14 @@ def append(self, item):
 
 if utils.PY3:
     import builtins
+    bytes = builtins.bytes
     range = builtins.range
     super = builtins.super
     round = builtins.round
     __all__ = []
 else:
+    from .newbytes import bytes
     from .newrange import range
     from .newsuper import super
     from .newround import round
-
-    __all__ = ['range', 'super', 'round']
+    __all__ = ['bytes', 'range', 'super', 'round']