ververt the change:add requires: python-urllib3

Change-Id: I1da52c98a29bba9d09cb56764efb58a42ee8e3fe
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/debian/control b/debian/control
index ffe900086796a1a24a449a597a301d27b39b06f9..f6fb1de6a46e490aff3a5a14bb6d351d46bcbedf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Package:  python-requests
 Architecture: all
 Depends:  ${python:Depends},
  rpm,
- python-urllib3,
  python,
  cpio,
  bzip2,

diff --git a/packaging/python-requests.spec b/packaging/python-requests.spec
index f90cd81403ebf2d3d70ea3c35db5da955c1f7a6c..98d56a1e6e1bef1e3f2ab72cbbd605411ae2a6f6 100644 (file)
--- a/packaging/python-requests.spec
+++ b/packaging/python-requests.spec
@@ -34,7 +34,6 @@ BuildRequires:  python
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       python
-Requires:       python-urllib3
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %else

diff --git a/requests/packages/urllib3/contrib/ntlmpool.py b/requests/packages/urllib3/contrib/ntlmpool.py
index 9a9f5127452ac9f4f20bdcc453c8c9b133e8cc43..c08a8d5a24328bcb1364c480bf08b34117ea9570 100644 (file)
--- a/requests/packages/urllib3/contrib/ntlmpool.py
+++ b/requests/packages/urllib3/contrib/ntlmpool.py
@@ -18,7 +18,7 @@ from logging import getLogger
 
 from ntlmpool import ntlm
 
-from urllib3 import HTTPSConnectionPool
+from requests.packages.urllib3 import HTTPSConnectionPool
 
 
 log = getLogger(__name__)