Merge pull request urllib3#1409 from pquentin/src-dir

Move urllib3 to src/urllib3
Dobatymo · Jul 4, 2018 · 1c42613 · 1c42613
2 parents 6531c84 + 16dce03
commit 1c42613
Show file tree

Hide file tree

Showing 37 changed files with 2 additions and 1 deletion.
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 base_path = os.path.dirname(__file__)
 
 # Get the version (borrowed from SQLAlchemy)
-with open(os.path.join(base_path, 'urllib3', '__init__.py')) as fp:
+with open(os.path.join(base_path, 'src', 'urllib3', '__init__.py')) as fp:
     VERSION = re.compile(r".*__version__ = '(.*?)'",
                          re.S).match(fp.read()).group(1)
 
@@ -58,6 +58,7 @@
                 'urllib3.packages.backports', 'urllib3.contrib',
                 'urllib3.contrib._securetransport', 'urllib3.util',
                 ],
+      package_dir={'': 'src'},
       requires=[],
       python_requires=">=2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4",
       tests_require=[

diff --git a/urllib3/__init__.py → src/urllib3/__init__.py b/urllib3/__init__.py → src/urllib3/__init__.py
diff --git a/urllib3/_collections.py → src/urllib3/_collections.py b/urllib3/_collections.py → src/urllib3/_collections.py
diff --git a/urllib3/connection.py → src/urllib3/connection.py b/urllib3/connection.py → src/urllib3/connection.py
diff --git a/urllib3/connectionpool.py → src/urllib3/connectionpool.py b/urllib3/connectionpool.py → src/urllib3/connectionpool.py
diff --git a/urllib3/contrib/__init__.py → src/urllib3/contrib/__init__.py b/urllib3/contrib/__init__.py → src/urllib3/contrib/__init__.py
diff --git a/urllib3/contrib/_securetransport/__init__.py → ...lib3/contrib/_securetransport/__init__.py b/urllib3/contrib/_securetransport/__init__.py → ...lib3/contrib/_securetransport/__init__.py
diff --git a/urllib3/contrib/_securetransport/bindings.py → ...lib3/contrib/_securetransport/bindings.py b/urllib3/contrib/_securetransport/bindings.py → ...lib3/contrib/_securetransport/bindings.py
diff --git a/...ib3/contrib/_securetransport/low_level.py → ...ib3/contrib/_securetransport/low_level.py b/...ib3/contrib/_securetransport/low_level.py → ...ib3/contrib/_securetransport/low_level.py
diff --git a/urllib3/contrib/appengine.py → src/urllib3/contrib/appengine.py b/urllib3/contrib/appengine.py → src/urllib3/contrib/appengine.py
diff --git a/urllib3/contrib/ntlmpool.py → src/urllib3/contrib/ntlmpool.py b/urllib3/contrib/ntlmpool.py → src/urllib3/contrib/ntlmpool.py
diff --git a/urllib3/contrib/pyopenssl.py → src/urllib3/contrib/pyopenssl.py b/urllib3/contrib/pyopenssl.py → src/urllib3/contrib/pyopenssl.py
diff --git a/urllib3/contrib/securetransport.py → src/urllib3/contrib/securetransport.py b/urllib3/contrib/securetransport.py → src/urllib3/contrib/securetransport.py
diff --git a/urllib3/contrib/socks.py → src/urllib3/contrib/socks.py b/urllib3/contrib/socks.py → src/urllib3/contrib/socks.py
diff --git a/urllib3/exceptions.py → src/urllib3/exceptions.py b/urllib3/exceptions.py → src/urllib3/exceptions.py
diff --git a/urllib3/fields.py → src/urllib3/fields.py b/urllib3/fields.py → src/urllib3/fields.py
diff --git a/urllib3/filepost.py → src/urllib3/filepost.py b/urllib3/filepost.py → src/urllib3/filepost.py
diff --git a/urllib3/packages/__init__.py → src/urllib3/packages/__init__.py b/urllib3/packages/__init__.py → src/urllib3/packages/__init__.py
diff --git a/urllib3/packages/backports/__init__.py → src/urllib3/packages/backports/__init__.py b/urllib3/packages/backports/__init__.py → src/urllib3/packages/backports/__init__.py
diff --git a/urllib3/packages/backports/makefile.py → src/urllib3/packages/backports/makefile.py b/urllib3/packages/backports/makefile.py → src/urllib3/packages/backports/makefile.py
diff --git a/urllib3/packages/ordered_dict.py → src/urllib3/packages/ordered_dict.py b/urllib3/packages/ordered_dict.py → src/urllib3/packages/ordered_dict.py
diff --git a/urllib3/packages/six.py → src/urllib3/packages/six.py b/urllib3/packages/six.py → src/urllib3/packages/six.py
diff --git a/...3/packages/ssl_match_hostname/__init__.py → ...3/packages/ssl_match_hostname/__init__.py b/...3/packages/ssl_match_hostname/__init__.py → ...3/packages/ssl_match_hostname/__init__.py
diff --git a/...ges/ssl_match_hostname/_implementation.py → ...ges/ssl_match_hostname/_implementation.py b/...ges/ssl_match_hostname/_implementation.py → ...ges/ssl_match_hostname/_implementation.py
diff --git a/urllib3/poolmanager.py → src/urllib3/poolmanager.py b/urllib3/poolmanager.py → src/urllib3/poolmanager.py
diff --git a/urllib3/request.py → src/urllib3/request.py b/urllib3/request.py → src/urllib3/request.py
diff --git a/urllib3/response.py → src/urllib3/response.py b/urllib3/response.py → src/urllib3/response.py
diff --git a/urllib3/util/__init__.py → src/urllib3/util/__init__.py b/urllib3/util/__init__.py → src/urllib3/util/__init__.py
diff --git a/urllib3/util/connection.py → src/urllib3/util/connection.py b/urllib3/util/connection.py → src/urllib3/util/connection.py
diff --git a/urllib3/util/queue.py → src/urllib3/util/queue.py b/urllib3/util/queue.py → src/urllib3/util/queue.py
diff --git a/urllib3/util/request.py → src/urllib3/util/request.py b/urllib3/util/request.py → src/urllib3/util/request.py
diff --git a/urllib3/util/response.py → src/urllib3/util/response.py b/urllib3/util/response.py → src/urllib3/util/response.py
diff --git a/urllib3/util/retry.py → src/urllib3/util/retry.py b/urllib3/util/retry.py → src/urllib3/util/retry.py
diff --git a/urllib3/util/ssl_.py → src/urllib3/util/ssl_.py b/urllib3/util/ssl_.py → src/urllib3/util/ssl_.py
diff --git a/urllib3/util/timeout.py → src/urllib3/util/timeout.py b/urllib3/util/timeout.py → src/urllib3/util/timeout.py
diff --git a/urllib3/util/url.py → src/urllib3/util/url.py b/urllib3/util/url.py → src/urllib3/util/url.py
diff --git a/urllib3/util/wait.py → src/urllib3/util/wait.py b/urllib3/util/wait.py → src/urllib3/util/wait.py