Merge branch 'master' of https://github.com/Veedrac/python-future into develop

Author: edschofield

docs/conf.py

@@ -52,7 +52,7 @@
 #
 # if 'dev' in release:
 #     release = release.split('dev')[0] + 'dev'
-release = '0.12.0-dev'
+release = '0.12.0'
 version = release   # was: '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/faq.rst

@@ -118,11 +118,15 @@ Maturity
 Is it tested?
 -------------
 
-``future`` is used by ``mezzanine``, among other projects. Currently
-``future`` has 640+ unit tests. Many of these are straight from the Python 3.3
-test suite. In general, the ``future`` package itself is in good shape, whereas
-the ``futurize`` script for automatic porting is incomplete and imperfect.
-(Chances are it will require some manual cleanup afterwards.)
+``future`` is used by ``mezzanine`` and ``ObsPy``. It has also been used to
+help with the port of 800,000 lines of Python 2 code in Sage to Python 2/3
+(currently underway).
+
+Currently ``future`` has 800+ unit tests. Many of these are straight from the
+Python 3.3 test suite. In general, the ``future`` package itself is in good
+shape, whereas the ``futurize`` script for automatic porting is incomplete and
+imperfect.  (Chances are it will require some manual cleanup afterwards.) The
+``past`` package also needs further work.
 
 Is the API stable?
 ------------------

docs/whatsnew.rst

@@ -247,9 +247,9 @@ Many small improvements and fixes have been made across the project. Some highli
 
 - Improved compatibility with py2exe (`issue #31 <https://github.com/PythonCharmers/python-future/issues/31>`_).
 
-- The ``future.utils.bytes_to_native_str`` function now returns a ``newbytes``
-  object on Py2. (`Issue #47
-  <https://github.com/PythonCharmers/python-future/issues/47>`_).
+- The ``future.utils.bytes_to_native_str`` function now returns a ``native_str``
+  object and ``future.utils.native_str_to_bytes`` returns a ``newbytes`` on Py2.
+  (`Issue #47 <https://github.com/PythonCharmers/python-future/issues/47>`_).
 
 - The backported ``http.client`` module and related modules use other new
   backported modules such as ``email``. As a result they are more compliant

future/__init__.py

@@ -78,6 +78,6 @@
 __ver_major__ = 0
 __ver_minor__ = 12
 __ver_patch__ = 0
-__ver_sub__ = '-dev'
+__ver_sub__ = ''
 __version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__,
                               __ver_patch__, __ver_sub__)

future/standard_library/misc.py

@@ -0,0 +1,12 @@
+"""
+Miscellaneous function (re)definitions from the Py3.3 standard library for
+Python 2.6/2.7.
+"""
+from math import ceil as oldceil
+
+def ceil(x):
+    """
+    Return the ceiling of x as an int.
+    This is the smallest integral value >= x.
+    """
+    return int(oldceil(x))

future/tests/test_bytes.py

@@ -168,6 +168,18 @@ def test_bytes_plus_bytes(self):
         self.assertEqual(b4, b'ZYXWABCD')
         self.assertTrue(isinstance(b4, bytes))
 
+    def test_find_not_found(self):
+        self.assertEqual(-1, bytes(b'ABCDE').find(b':'))
+
+    def test_find_found(self):
+        self.assertEqual(2, bytes(b'AB:CD:E').find(b':'))
+
+    def test_rfind_not_found(self):
+        self.assertEqual(-1, bytes(b'ABCDE').rfind(b':'))
+
+    def test_rfind_found(self):
+        self.assertEqual(5, bytes(b'AB:CD:E').rfind(b':'))
+
     def test_bytes_join_bytes(self):
         b = bytes(b' * ')
         strings = [b'AB', b'EFGH', b'IJKL']

future/types/newbytes.py

@@ -165,11 +165,11 @@ def fromhex(cls, string):
 
     @no(unicode)
     def find(self, sub, *args):
-        return newbytes(super(newbytes, self).find(sub, *args))
+        return super(newbytes, self).find(sub, *args)
 
     @no(unicode)
     def rfind(self, sub, *args):
-        return newbytes(super(newbytes, self).rfind(sub, *args))
+        return super(newbytes, self).rfind(sub, *args)
 
     @no(unicode, (1, 2))
     def replace(self, old, new, *args):

past/__init__.py

@@ -104,7 +104,7 @@
 __ver_major__ = 0
 __ver_minor__ = 12
 __ver_patch__ = 0
-__ver_sub__ = '-dev'
+__ver_sub__ = ''
 __version__ = "%d.%d.%d%s" % (__ver_major__, __ver_minor__,
                               __ver_patch__, __ver_sub__)