diff options
| author | Daniele Tricoli <eriol@mornie.org> | 2012-04-01 09:33:32 +0000 |
|---|---|---|
| committer | Daniele Tricoli <eriol@mornie.org> | 2012-04-01 09:33:32 +0000 |
| commit | 67457cf217fb8bcd901a7ff6fe76493d6f0de142 (patch) | |
| tree | fef8a601d9b34f79918a2c2b5b54f0962c277870 | |
| parent | 38535a1714d03f6fc7b953d824e59a90dce5682b (diff) | |
| download | python-requests-67457cf217fb8bcd901a7ff6fe76493d6f0de142.tar python-requests-67457cf217fb8bcd901a7ff6fe76493d6f0de142.tar.gz | |
Refreshed debian/patches/02_do-not-use-embedded-python-six.patch
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/patches/02_do-not-use-embedded-python-six.patch | 13 |
2 files changed, 14 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 67a3ee3..7ecf4b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ requests (0.11.1-1) UNRELEASED; urgency=low * New upstream release + * debian/patches/02_do-not-use-embedded-python-six.patch + - Refreshed - -- Daniele Tricoli <eriol@mornie.org> Sun, 01 Apr 2012 09:56:20 +0200 + -- Daniele Tricoli <eriol@mornie.org> Sun, 01 Apr 2012 11:32:04 +0200 requests (0.10.8-1) unstable; urgency=low diff --git a/debian/patches/02_do-not-use-embedded-python-six.patch b/debian/patches/02_do-not-use-embedded-python-six.patch index 2cd415b..f045f5a 100644 --- a/debian/patches/02_do-not-use-embedded-python-six.patch +++ b/debian/patches/02_do-not-use-embedded-python-six.patch @@ -5,15 +5,15 @@ Last-Update: 2012-03-19 --- a/requests/packages/urllib3/connectionpool.py +++ b/requests/packages/urllib3/connectionpool.py -@@ -59,7 +59,7 @@ +@@ -51,7 +51,7 @@ ) from .packages.ssl_match_hostname import match_hostname, CertificateError -from .packages import six +import six - xrange = six.moves.xrange + xrange = six.moves.xrange --- a/requests/packages/urllib3/filepost.py +++ b/requests/packages/urllib3/filepost.py @@ -14,8 +14,8 @@ @@ -38,3 +38,12 @@ Last-Update: 2012-03-19 log = logging.getLogger(__name__) +--- a/requests/packages/urllib3/util.py ++++ b/requests/packages/urllib3/util.py +@@ -16,7 +16,7 @@ + except ImportError: # `select` doesn't exist on AppEngine. + select = False + +-from .packages import six ++import six + from .exceptions import LocationParseError |