From: biao716.wang Date: Sun, 5 Jan 2020 16:40:01 +0000 (+0900) Subject: ververt the change:add requires: python-urllib3 X-Git-Tag: accepted/tizen/devbase/services/20200110.011148 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4ea24a69addafb83cbed267e4dcfd7eabf26f130;p=services%2Fpython-requests.git ververt the change:add requires: python-urllib3 Change-Id: I1da52c98a29bba9d09cb56764efb58a42ee8e3fe Signed-off-by: biao716.wang --- diff --git a/debian/control b/debian/control index ffe9000..f6fb1de 100644 --- 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 f90cd81..98d56a1 100644 --- 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 9a9f512..c08a8d5 100644 --- 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__)