Set past.utils as the canonical home for old_div()

Author: edschofield

docs/compatible_idioms.rst

@@ -188,7 +188,7 @@ Integer division (rounding down):
 .. code:: python
 
     # Python 2 and 3:
-    from future.utils import old_div
+    from past.utils import old_div
     
     a = old_div(b, c)    # always same as / on Py2
 Long integers

docs/notebooks/Writing Python 2-3 compatible code.ipynb

@@ -1,7 +1,7 @@
 {
  "metadata": {
   "name": "",
-  "signature": "sha256:f4ac8456d9c7976cb130d88556b7bbe2c3494a960d29e3eeffdca80a91b080e3"
+  "signature": "sha256:c37888c8f9a1f8ba6d3693b55f121f2581ba744bc5feb6b9153a419891328945"
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -491,7 +491,7 @@
      "collapsed": false,
      "input": [
       "# Python 2 and 3:\n",
-      "from future.utils import old_div\n",
+      "from past.utils import old_div\n",
       "\n",
       "a = old_div(b, c)    # always same as / on Py2"
      ],

future/tests/test_futurize.py

@@ -1144,7 +1144,7 @@ def __truediv__(self, other):
         """
         after = """
         from __future__ import division
-        from past.utils import div
+        from past.utils import old_div
         class Path(str):
             def __div__(self, other):
                 return self.__truediv__(other)

future/utils/__init__.py

@@ -1,14 +1,6 @@
 """
 A selection of cross-compatible functions for Python 2 and 3.
 
-These come from several sources:
-
-    * Jinja2 (BSD licensed: see
-      https://github.com/mitsuhiko/jinja2/blob/master/LICENSE)
-    * Pandas compatibility module pandas.compat
-    * six.py by Benjamin Peterson
-    * Django
-
 This exports useful functions for 2/3 compatible code that are not
 builtins on Python 3:
 
@@ -68,6 +60,13 @@
 
 On Python 3, this decorator is a no-op.
 
+Some of the functions in this module come from the following sources:
+
+    * Jinja2 (BSD licensed: see
+      https://github.com/mitsuhiko/jinja2/blob/master/LICENSE)
+    * Pandas compatibility module pandas.compat
+    * six.py by Benjamin Peterson
+    * Django
 """
 
 import types
@@ -617,7 +616,7 @@ def exec_(code, globs=None, locs=None):
         exec("""exec code in globs, locs""")
 
 
-# Defined here too for backward compatibility:
+# Defined here for backward compatibility:
 def old_div(a, b):
     """
     DEPRECATED: import ``old_div`` from ``past.utils`` instead.

past/__init__.py

@@ -33,16 +33,6 @@
     >>> type(philosopher[0])
     <past.builtins.oldstr>
 
-    >>> # The div() function behaves like Python 2's / operator
-    >>> # without "from __future__ import division"
-    >>> from past.utils import div
-    >>> div(3, 2)    # like 3/2 in Py2
-    0
-    >>> div(3, 2.0)  # like 3/2.0 in Py2
-    1.5
-
-    This is an alias for ``future.utils.old_div``.
-
     >>> # List-producing versions of range, reduce, map, filter
     >>> from past.builtins import range, reduce
     >>> range(10)

past/utils/__init__.py

@@ -1,10 +1,26 @@
+"""
+Various non-built-in utility functions and definitions for Py2
+compatibility in Py3.
+
+For example:
+
+    >>> # The old_div() function behaves like Python 2's / operator
+    >>> # without "from __future__ import division"
+    >>> from past.utils import old_div
+    >>> old_div(3, 2)    # like 3/2 in Py2
+    0
+    >>> old_div(3, 2.0)  # like 3/2.0 in Py2
+    1.5
+"""
+
 import sys
 import numbers
 
 PY3 = sys.version_info[0] == 3
 PY2 = sys.version_info[0] == 2
 PYPY = hasattr(sys, 'pypy_translation_info')
 
+
 def with_metaclass(meta, *bases):
     """
     Function from jinja2/_compat.py. License: BSD.