Merge branch 'develop'

Author: edschofield

README.rst

@@ -136,6 +136,7 @@ hooks. The context-manager form works like this::
         from itertools import filterfalse
         import html.parser
         import queue
+        from urllib.request import urlopen
 
 
 Automatic conversion to Py2/3-compatible code

docs/standard_library_imports.rst

@@ -25,6 +25,7 @@ The first interface is via a context-manager called ``hooks``::
         from collections import UserList
         from itertools import filterfalse, zip_longest
         from http.client import HttpConnection
+        import urllib.request
         # and other moved modules and definitions
 
 Direct interface
@@ -33,9 +34,9 @@ Direct interface
 The second interface avoids import hooks. It may therefore be more
 robust, at the cost of less idiomatic code. Use it as follows::
 
-    from future.standard_library import queue
-    from future.standard_library import socketserver
-    from future.standard_library.http.client import HTTPConnection
+    from future.moves import queue
+    from future.moves import socketserver
+    from future.moves.http.client import HTTPConnection
     # etc.
 
 If you wish to achieve the effect of a two-level import such as this::
@@ -45,12 +46,12 @@ If you wish to achieve the effect of a two-level import such as this::
 portably on both Python 2 and Python 3, note that Python currently does not
 support syntax like this::
 
-    from future.standard_library import http.client
+    from future.moves import http.client
 
 One workaround (which ``six.moves`` also requires) is to replace the dot with
 an underscore::
 
-    import future.standard_library.http.client as http_client
+    import future.moves.http.client as http_client
 
 ``import_`` and from_import functions
 -----------------------------------------

docs/whatsnew.rst

@@ -25,7 +25,8 @@ explicitly, as follows::
         ...
 
 This now causes these modules to be imported from ``future.moves``, a new
-package that imports symbols from the native standard library modules.
+package that provides wrappers over the native Python 2 standard library with
+the new Python 3 organization.
 
 The functional interface is now deprecated but still supported for backwards
 compatibility::
@@ -171,16 +172,24 @@ The number of unit tests has increased from 600 to over 800. Most of the new
 tests come from Python 3.3's test suite.
 
 
+Refactoring of ``future.standard_library.*`` -> ``future.backports``
+--------------------------------------------------------------------
+
+The backported standard library modules have been moved to ``future.backports``
+to make the distinction clearer between these and the new ``future.moves``
+package.
+
+
 Backported ``http.server`` and ``urllib`` modules
 -------------------------------------------------
 
 Alpha versions of backports of the ``http.server`` and ``urllib`` module from
-Python 3.3's standard library are now provided in ``future.standard_library``.
+Python 3.3's standard library are now provided in ``future.backports``.
 
 Use them like this::
 
-    from future.standard_library.urllib.request import Request    # etc.
-    from future.standard_library.http import server as http_server
+    from future.backports.urllib.request import Request    # etc.
+    from future.backports.http import server as http_server
 
 or with this new interface::
 
@@ -220,15 +229,14 @@ Many small improvements and fixes have been made across the project. Some highli
 - Fixes and updates from Python 3.3.5 have been included in the backported
   standard library modules.
 
-- ``http.client`` module and related modules use the new backported modules
-  such as ``email``. As a result they are more compliant with the Python 3.3
-  equivalents.
-
 - Scrubbing of the ``sys.modules`` cache performed by ``remove_hooks()`` (also
   called by the ``suspend_hooks`` and ``hooks`` context managers) is now more
-  conservative. It now removes only modules with Py3 names (such as
-  ``urllib.parse``) and not the corresponding ``future.standard_library.*``
-  modules (such as ``future.standard_library.urllib.parse``.
+  conservative.
+  
+..  Is this still true?
+..  It now removes only modules with Py3 names (such as
+..  ``urllib.parse``) and not the corresponding ``future.standard_library.*``
+..  modules (such as ``future.standard_library.urllib.parse``.
 
 - The ``fix_next`` and ``fix_reduce`` fixers have been moved to stage 1 of
   ``futurize``.
@@ -243,6 +251,10 @@ Many small improvements and fixes have been made across the project. Some highli
   object 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
+  with the Python 3.3 equivalents.
+
 
 .. whats-new-0.11.5:
 

…/standard_library/email/mime/__init__.py future/backports/__init__.pyfuture/standard_library/email/mime/__init__.py renamed to future/backports/__init__.py future/standard_library/email/mime/__init__.py renamed to future/backports/__init__.py

@@ -50,29 +50,29 @@ def message_from_string(s, *args, **kws):
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import Parser
+    from future.backports.email.parser import Parser
     return Parser(*args, **kws).parsestr(s)
 
 def message_from_bytes(s, *args, **kws):
     """Parse a bytes string into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import BytesParser
+    from future.backports.email.parser import BytesParser
     return BytesParser(*args, **kws).parsebytes(s)
 
 def message_from_file(fp, *args, **kws):
     """Read a file and parse its contents into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import Parser
+    from future.backports.email.parser import Parser
     return Parser(*args, **kws).parse(fp)
 
 def message_from_binary_file(fp, *args, **kws):
     """Read a binary file and parse its contents into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import BytesParser
+    from future.backports.email.parser import BytesParser
     return BytesParser(*args, **kws).parse(fp)

future/standard_library/_markupbase.py future/backports/_markupbase.pyfuture/standard_library/_markupbase.py renamed to future/backports/_markupbase.py

@@ -51,7 +51,7 @@
 import binascii
 import functools
 from string import ascii_letters, digits
-from future.standard_library.email import errors
+from future.backports.email import errors
 
 __all__ = ['decode_q',
            'encode_q',

future/standard_library/datetime.py future/backports/datetime.pyfuture/standard_library/datetime.py renamed to future/backports/datetime.py

@@ -75,10 +75,10 @@
 import re
 from collections import namedtuple, OrderedDict
 
-from future.standard_library.urllib.parse import (unquote, unquote_to_bytes)
-from future.standard_library.email import _encoded_words as _ew
-from future.standard_library.email import errors
-from future.standard_library.email import utils
+from future.backports.urllib.parse import (unquote, unquote_to_bytes)
+from future.backports.email import _encoded_words as _ew
+from future.backports.email import errors
+from future.backports.email import utils
 
 #
 # Useful constants and functions