[Python-modules-commits] [python-future] 04/08: merge patched into master

[Vincent Bernat]

This is an automated email from the git hooks/post-receive script.

bernat pushed a commit to branch master
in repository python-future.

commit 92cf5017e760c542d87ddf34a7eb5ba61a85ce71
Merge: 8acf9d4 6e3c0d5
Author: Vincent Bernat <bernat at debian.org>
Date:   Tue May 3 21:53:10 2016 +0200

    merge patched into master

 debian/.git-dpm                                                       | 4 ++--
 ...ves-configparser-module.patch => remove-configparser-module.patch} | 4 ++--
 debian/patches/series                                                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index beb881d,0000000..c1ddf3e
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 38de32f2cbe47d5e7017b513e6e9ff94029ae548
- 38de32f2cbe47d5e7017b513e6e9ff94029ae548
++6e3c0d5f332a2f591c36d477e5c254849b7d40f5
++6e3c0d5f332a2f591c36d477e5c254849b7d40f5
 +a221055395c07bbd060ef683775843da55465485
 +a221055395c07bbd060ef683775843da55465485
 +python-future_0.15.2.orig.tar.gz
 +431bf8ff160e8e785a2f76c3e57c1b6c2b13b41a
 +1583441
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove-configparser-module.patch
index 058f28f,0000000..056aca4
mode 100644,000000..100644
--- a/debian/patches/remove-configparser-module.patch
+++ b/debian/patches/remove-configparser-module.patch
@@@ -1,71 -1,0 +1,71 @@@
- From 38de32f2cbe47d5e7017b513e6e9ff94029ae548 Mon Sep 17 00:00:00 2001
++From 6e3c0d5f332a2f591c36d477e5c254849b7d40f5 Mon Sep 17 00:00:00 2001
 +From: Vincent Bernat <bernat at debian.org>
 +Date: Tue, 3 May 2016 21:51:13 +0200
 +Subject: Do not ship a configparser module
 +
 +This module is already backported in python-configparser package.
 +
 +Bug-Debian: https://bugs.debian.org/822157
 +Bug: https://github.com/PythonCharmers/python-future/issues/118
 +
- Patch-Name: removes-configparser-module.patch
++Patch-Name: remove-configparser-module.patch
 +---
 + setup.py                                   |  2 --
 + src/configparser/__init__.py               | 13 -------------
 + tests/test_future/test_standard_library.py |  3 ---
 + 3 files changed, 18 deletions(-)
 + delete mode 100644 src/configparser/__init__.py
 +
 +diff --git a/setup.py b/setup.py
 +index 7c81a099c132..1b2380c85dae 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",
 +@@ -134,7 +133,6 @@ try:
 +                           '_markupbase',
 +                           '_thread',
 +                           'builtins',
 +-                          'configparser',
 +                           'copyreg',
 +                           'html',
 +                           'http',
 +diff --git a/src/configparser/__init__.py b/src/configparser/__init__.py
 +deleted file mode 100644
 +index 3642c5ec19df..000000000000
 +--- 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 399d587fcb53..62b40a251a5d 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
 + 
diff --cc debian/patches/series
index 317f118,0000000..e97d6dd
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,3 @@@
 +do-not-use-bootstrap.patch
 +removes-privacy-breach-in-docs.patch
- removes-configparser-module.patch
++remove-configparser-module.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-future.git