From 6a27949e5f01b324dcdc7ebadb4d1be5da42b61b Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Thu, 15 Mar 2018 09:20:32 -0400 Subject: [PATCH] rfc3986 --- Pipfile | 1 + requests/basics.py | 1 + requests/structures.py | 2 +- setup.py | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index 3225341e..da56c805 100644 --- a/Pipfile +++ b/Pipfile @@ -25,6 +25,7 @@ pytest-mypy = "*" white = {version="*"} "e1839a8" = {path = ".", editable = true, extras=["socks"]} mypy = "==0.540" +"rfc3986" = "*" [packages] diff --git a/requests/basics.py b/requests/basics.py index 550c7022..30b3f46f 100644 --- a/requests/basics.py +++ b/requests/basics.py @@ -35,6 +35,7 @@ from urllib.request import ( from http import cookiejar as cookielib from http.cookies import Morsel from io import StringIO +from collections import OrderedDict builtin_str = str # type: ignore str = str # type: ignore diff --git a/requests/structures.py b/requests/structures.py index 0011baed..36ac85b6 100644 --- a/requests/structures.py +++ b/requests/structures.py @@ -8,7 +8,7 @@ Data structures that power Requests. import collections -from .compat import basestring, OrderedDict +from .basics import basestring, OrderedDict class CaseInsensitiveDict(collections.MutableMapping): diff --git a/setup.py b/setup.py index d0f24bcd..daf27ab9 100755 --- a/setup.py +++ b/setup.py @@ -74,6 +74,7 @@ requires = [ 'idna>=2.5,<2.7', 'urllib3>=1.21.1,<1.23', 'certifi>=2017.4.17', + 'rfc3986>=1.1.0<2', ] test_requirements = [ 'pytest-httpbin==0.0.7',