diff options
Diffstat (limited to 'debian/patches/05_upstream_devendorize.patch')
| -rw-r--r-- | debian/patches/05_upstream_devendorize.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/debian/patches/05_upstream_devendorize.patch b/debian/patches/05_upstream_devendorize.patch deleted file mode 100644 index 1c5750f..0000000 --- a/debian/patches/05_upstream_devendorize.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bf94fe6ca734a95614c33473cad145323d3495d3 Mon Sep 17 00:00:00 2001 -From: Markus Unterwaditzer <markus@unterwaditzer.net> -Date: Fri, 24 Apr 2015 12:05:18 +0200 -Subject: Import aliases for Debian - -Alternative to #2375 -Patch-Name: 05_upstream_devendorize.patch ---- - requests/packages/__init__.py | 35 ++++++++++++++++++++++++++++++++++- - 1 file changed, 34 insertions(+), 1 deletion(-) - -diff --git a/requests/packages/__init__.py b/requests/packages/__init__.py -index d62c4b7..971c2ad 100644 ---- a/requests/packages/__init__.py -+++ b/requests/packages/__init__.py -@@ -1,3 +1,36 @@ -+''' -+Debian and other distributions "unbundle" requests' vendored dependencies, and -+rewrite all imports to use the global versions of ``urllib3`` and ``chardet``. -+The problem with this is that not only requests itself imports those -+dependencies, but third-party code outside of the distros' control too. -+ -+In reaction to these problems, the distro maintainers replaced -+``requests.packages`` with a magical "stub module" that imports the correct -+modules. The implementations were varying in quality and all had severe -+problems. For example, a symlink (or hardlink) that links the correct modules -+into place introduces problems regarding object identity, since you now have -+two modules in `sys.modules` with the same API, but different identities:: -+ -+ requests.packages.urllib3 is not urllib3 -+ -+With version ``2.5.2``, requests started to maintain its own stub, so that -+distro-specific breakage would be reduced to a minimum, even though the whole -+issue is not requests' fault in the first place. See -+https://github.com/kennethreitz/requests/pull/2375 for the corresponding pull -+request. -+''' -+ - from __future__ import absolute_import -+import sys -+ -+try: -+ from . import urllib3 -+except ImportError: -+ import urllib3 -+ sys.modules['%s.urllib3' % __name__] = urllib3 - --from . import urllib3 -+try: -+ from . import chardet -+except ImportError: -+ import chardet -+ sys.modules['%s.chardet' % __name__] = chardet |