diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2015-01-21 16:56:00 +0200 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2015-01-21 16:56:00 +0200 |
| commit | 060093cb093c8dc237ad11ec681c7e0f9ed97cc2 (patch) | |
| tree | af9709fd31d277d234681ae5f9a8c30aff0bc76a | |
| parent | 6e1839a01ede7010ff130eab058c2ddd6d71902d (diff) | |
| download | six-060093cb093c8dc237ad11ec681c7e0f9ed97cc2.tar.gz | |
Issue #112: six.moves.reload_module now uses importlib module on Python 3.4+.
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | documentation/index.rst | 4 | ||||
| -rw-r--r-- | six.py | 3 |
3 files changed, 8 insertions, 2 deletions
@@ -26,6 +26,9 @@ This file lists the changes in each six version. - Pull request #51: Add `six.view(keys|values|itmes)`, which provide dictionary views on Python 2.7+. +- Issue #112: `six.moves.reload_module` now uses the importlib module on + Python 3.4+. + 1.8.0 ----- diff --git a/documentation/index.rst b/documentation/index.rst index 1f27400..a8632e7 100644 --- a/documentation/index.rst +++ b/documentation/index.rst @@ -598,7 +598,9 @@ Supported renames: +------------------------------+-------------------------------------+-------------------------------------+ | ``reduce`` | :func:`py2:reduce` | :func:`py3:functools.reduce` | +------------------------------+-------------------------------------+-------------------------------------+ -| ``reload_module`` | :func:`py2:reload` | :func:`py3:imp.reload` | +| ``reload_module`` | :func:`py2:reload` | :func:`py3:imp.reload`, | +| | | :func:`py3:importlib.reload` | +| | | on Python 3.4+ | +------------------------------+-------------------------------------+-------------------------------------+ | ``reprlib`` | :mod:`py2:repr` | :mod:`py3:reprlib` | +------------------------------+-------------------------------------+-------------------------------------+ @@ -35,6 +35,7 @@ __version__ = "1.9.0" # Useful for very coarse version differentiation. PY2 = sys.version_info[0] == 2 PY3 = sys.version_info[0] == 3 +PY34 = sys.version_info[0:2] >= (3, 4) if PY3: string_types = str, @@ -235,7 +236,7 @@ _moved_attributes = [ MovedAttribute("intern", "__builtin__", "sys"), MovedAttribute("map", "itertools", "builtins", "imap", "map"), MovedAttribute("range", "__builtin__", "builtins", "xrange", "range"), - MovedAttribute("reload_module", "__builtin__", "imp", "reload"), + MovedAttribute("reload_module", "__builtin__", "importlib" if PY34 else "imp", "reload"), MovedAttribute("reduce", "__builtin__", "functools"), MovedAttribute("shlex_quote", "pipes", "shlex", "quote"), MovedAttribute("StringIO", "StringIO", "io"), |