From a6bd30510feb5b988633647eed0015589caefcc1 Mon Sep 17 00:00:00 2001 From: Ed Schofield Date: Tue, 13 Dec 2016 15:29:47 +1100 Subject: [PATCH] Fix for install_aliases() omitting ChainMap (issue #226) --- docs/whatsnew.rst | 8 ++++++++ src/future/standard_library/__init__.py | 1 + 2 files changed, 9 insertions(+) diff --git a/docs/whatsnew.rst b/docs/whatsnew.rst index f349ffef..0e89646a 100644 --- a/docs/whatsnew.rst +++ b/docs/whatsnew.rst @@ -5,6 +5,14 @@ What's New .. _whats-new-0.16.x: +What's new in version 0.16.1 (unreleased) +========================================= + +This is a minor bug-fix release: + +- Fix `from collections import ChainMap` after install_aliases() (issue #226) + + What's new in version 0.16.0 (2016-10-27) ========================================== diff --git a/src/future/standard_library/__init__.py b/src/future/standard_library/__init__.py index aca58c3e..c2d35bdc 100644 --- a/src/future/standard_library/__init__.py +++ b/src/future/standard_library/__init__.py @@ -180,6 +180,7 @@ MOVES = [('collections', 'UserList', 'UserList', 'UserList'), ('collections', 'UserDict', 'UserDict', 'UserDict'), ('collections', 'UserString','UserString', 'UserString'), + ('collections', 'ChainMap', 'future.backports.misc', 'ChainMap'), ('itertools', 'filterfalse','itertools', 'ifilterfalse'), ('itertools', 'zip_longest','itertools', 'izip_longest'), ('sys', 'intern','__builtin__', 'intern'),