From 89da05a84da87ba298a5f8770b899050d127280c Mon Sep 17 00:00:00 2001 From: Elliott Sales de Andrade Date: Sun, 9 Nov 2014 17:52:41 -0500 Subject: [PATCH 1/2] Remove configparser backport. It conflicts with another backport. Signed-off-by: Elliott Sales de Andrade --- setup.py | 6 ++---- src/configparser/__init__.py | 13 ------------- tests/test_future/test_standard_library.py | 3 --- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 src/configparser/__init__.py diff --git a/setup.py b/setup.py index 7c81a09..bbaef58 100755 --- a/setup.py +++ b/setup.py @@ -58,7 +58,6 @@ PACKAGES = ["future", if sys.version_info[:2] < (3, 0): PACKAGES += [ "builtins", - "configparser", "copyreg", "html", "http", @@ -124,17 +123,16 @@ try: # If the user happens to run: # python2 setup.py build # python3 setup.py install - # then folders like "configparser" will be in build/lib. + # then folders like "copyreg" will be in build/lib. # If so, we CANNOT let the user install this, because # this may break his/her Python 3 install, depending on the folder order in - # sys.path. (Running "import configparser" etc. may pick up our Py2 + # sys.path. (Running "import copyreg" etc. may pick up our Py2 # substitute packages, instead of the intended system stdlib modules.) SYSTEM_MODULES = set([ '_dummy_thread', '_markupbase', '_thread', 'builtins', - 'configparser', 'copyreg', 'html', 'http', diff --git a/src/configparser/__init__.py b/src/configparser/__init__.py deleted file mode 100644 index 3642c5e..0000000 --- a/src/configparser/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -from __future__ import absolute_import -import sys - -if sys.version_info[0] < 3: - from ConfigParser import * - try: - from ConfigParser import (_Chainmap, Error, InterpolationMissingOptionError) - except ImportError: - pass -else: - raise ImportError('This package should not be accessible on Python 3. ' - 'Either you are trying to run from the python-future src folder ' - 'or your installation of python-future is corrupted.') diff --git a/tests/test_future/test_standard_library.py b/tests/test_future/test_standard_library.py index fc564a5..e44cb26 100644 --- a/tests/test_future/test_standard_library.py +++ b/tests/test_future/test_standard_library.py @@ -271,9 +271,6 @@ class TestStandardLibraryReorganization(CodeHandler): with self.assertRaises(CalledProcessError): output = self._run_test_script('importme1.py') - def test_configparser(self): - import configparser - def test_copyreg(self): import copyreg -- 1.9.3