Merge pull request #1409 from pquentin/src-dir

Move urllib3 to src/urllib3

37 files changed, 2 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 770b427d..17f33776 100755
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ import codecs
 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 @@ setup(name='urllib3',
                 '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 b/src/urllib3/__init__.py
index 0cd5e342..0cd5e342 100644
--- a/urllib3/__init__.py
+++ b/src/urllib3/__init__.py
diff --git a/urllib3/_collections.py b/src/urllib3/_collections.py
index 6e36b84e..6e36b84e 100644
--- a/urllib3/_collections.py
+++ b/src/urllib3/_collections.py
diff --git a/urllib3/connection.py b/src/urllib3/connection.py
index a03b573f..a03b573f 100644
--- a/urllib3/connection.py
+++ b/src/urllib3/connection.py
diff --git a/urllib3/connectionpool.py b/src/urllib3/connectionpool.py
index 8fcb0bce..8fcb0bce 100644
--- a/urllib3/connectionpool.py
+++ b/src/urllib3/connectionpool.py
diff --git a/urllib3/contrib/__init__.py b/src/urllib3/contrib/__init__.py
index e69de29b..e69de29b 100644
--- a/urllib3/contrib/__init__.py
+++ b/src/urllib3/contrib/__init__.py
diff --git a/urllib3/contrib/_securetransport/__init__.py b/src/urllib3/contrib/_securetransport/__init__.py
index e69de29b..e69de29b 100644
--- a/urllib3/contrib/_securetransport/__init__.py
+++ b/src/urllib3/contrib/_securetransport/__init__.py
diff --git a/urllib3/contrib/_securetransport/bindings.py b/src/urllib3/contrib/_securetransport/bindings.py
index bcf41c02..bcf41c02 100644
--- a/urllib3/contrib/_securetransport/bindings.py
+++ b/src/urllib3/contrib/_securetransport/bindings.py
diff --git a/urllib3/contrib/_securetransport/low_level.py b/src/urllib3/contrib/_securetransport/low_level.py
index b13cd9e7..b13cd9e7 100644
--- a/urllib3/contrib/_securetransport/low_level.py
+++ b/src/urllib3/contrib/_securetransport/low_level.py
diff --git a/urllib3/contrib/appengine.py b/src/urllib3/contrib/appengine.py
index 66922e06..66922e06 100644
--- a/urllib3/contrib/appengine.py
+++ b/src/urllib3/contrib/appengine.py
diff --git a/urllib3/contrib/ntlmpool.py b/src/urllib3/contrib/ntlmpool.py
index 642e99ed..642e99ed 100644
--- a/urllib3/contrib/ntlmpool.py
+++ b/src/urllib3/contrib/ntlmpool.py
diff --git a/urllib3/contrib/pyopenssl.py b/src/urllib3/contrib/pyopenssl.py
index 7c0e9465..7c0e9465 100644
--- a/urllib3/contrib/pyopenssl.py
+++ b/src/urllib3/contrib/pyopenssl.py
diff --git a/urllib3/contrib/securetransport.py b/src/urllib3/contrib/securetransport.py
index 77cb59ed..77cb59ed 100644
--- a/urllib3/contrib/securetransport.py
+++ b/src/urllib3/contrib/securetransport.py
diff --git a/urllib3/contrib/socks.py b/src/urllib3/contrib/socks.py
index 811e312e..811e312e 100644
--- a/urllib3/contrib/socks.py
+++ b/src/urllib3/contrib/socks.py
diff --git a/urllib3/exceptions.py b/src/urllib3/exceptions.py
index 7bbaa987..7bbaa987 100644
--- a/urllib3/exceptions.py
+++ b/src/urllib3/exceptions.py
diff --git a/urllib3/fields.py b/src/urllib3/fields.py
index 37fe64a3..37fe64a3 100644
--- a/urllib3/fields.py
+++ b/src/urllib3/fields.py
diff --git a/urllib3/filepost.py b/src/urllib3/filepost.py
index 78f1e19b..78f1e19b 100644
--- a/urllib3/filepost.py
+++ b/src/urllib3/filepost.py
diff --git a/urllib3/packages/__init__.py b/src/urllib3/packages/__init__.py
index 170e974c..170e974c 100644
--- a/urllib3/packages/__init__.py
+++ b/src/urllib3/packages/__init__.py
diff --git a/urllib3/packages/backports/__init__.py b/src/urllib3/packages/backports/__init__.py
index e69de29b..e69de29b 100644
--- a/urllib3/packages/backports/__init__.py
+++ b/src/urllib3/packages/backports/__init__.py
diff --git a/urllib3/packages/backports/makefile.py b/src/urllib3/packages/backports/makefile.py
index 75b80dcf..75b80dcf 100644
--- a/urllib3/packages/backports/makefile.py
+++ b/src/urllib3/packages/backports/makefile.py
diff --git a/urllib3/packages/ordered_dict.py b/src/urllib3/packages/ordered_dict.py
index 4479363c..4479363c 100644
--- a/urllib3/packages/ordered_dict.py
+++ b/src/urllib3/packages/ordered_dict.py
diff --git a/urllib3/packages/six.py b/src/urllib3/packages/six.py
index 190c0239..190c0239 100644
--- a/urllib3/packages/six.py
+++ b/src/urllib3/packages/six.py
diff --git a/urllib3/packages/ssl_match_hostname/__init__.py b/src/urllib3/packages/ssl_match_hostname/__init__.py
index d6594eb2..d6594eb2 100644
--- a/urllib3/packages/ssl_match_hostname/__init__.py
+++ b/src/urllib3/packages/ssl_match_hostname/__init__.py
diff --git a/urllib3/packages/ssl_match_hostname/_implementation.py b/src/urllib3/packages/ssl_match_hostname/_implementation.py
index 1fd42f38..1fd42f38 100644
--- a/urllib3/packages/ssl_match_hostname/_implementation.py
+++ b/src/urllib3/packages/ssl_match_hostname/_implementation.py
diff --git a/urllib3/poolmanager.py b/src/urllib3/poolmanager.py
index 506a3c9b..506a3c9b 100644
--- a/urllib3/poolmanager.py
+++ b/src/urllib3/poolmanager.py
diff --git a/urllib3/request.py b/src/urllib3/request.py
index 1be33341..1be33341 100644
--- a/urllib3/request.py
+++ b/src/urllib3/request.py
diff --git a/urllib3/response.py b/src/urllib3/response.py
index 9873cb94..9873cb94 100644
--- a/urllib3/response.py
+++ b/src/urllib3/response.py
diff --git a/urllib3/util/__init__.py b/src/urllib3/util/__init__.py
index 2f2770b6..2f2770b6 100644
--- a/urllib3/util/__init__.py
+++ b/src/urllib3/util/__init__.py
diff --git a/urllib3/util/connection.py b/src/urllib3/util/connection.py
index 5cf488f4..5cf488f4 100644
--- a/urllib3/util/connection.py
+++ b/src/urllib3/util/connection.py
diff --git a/urllib3/util/queue.py b/src/urllib3/util/queue.py
index d3d379a1..d3d379a1 100644
--- a/urllib3/util/queue.py
+++ b/src/urllib3/util/queue.py
diff --git a/urllib3/util/request.py b/src/urllib3/util/request.py
index 3ddfcd55..3ddfcd55 100644
--- a/urllib3/util/request.py
+++ b/src/urllib3/util/request.py
diff --git a/urllib3/util/response.py b/src/urllib3/util/response.py
index 67cf730a..67cf730a 100644
--- a/urllib3/util/response.py
+++ b/src/urllib3/util/response.py
diff --git a/urllib3/util/retry.py b/src/urllib3/util/retry.py
index 7ad3dc66..7ad3dc66 100644
--- a/urllib3/util/retry.py
+++ b/src/urllib3/util/retry.py
diff --git a/urllib3/util/ssl_.py b/src/urllib3/util/ssl_.py
index 2893752a..2893752a 100644
--- a/urllib3/util/ssl_.py
+++ b/src/urllib3/util/ssl_.py
diff --git a/urllib3/util/timeout.py b/src/urllib3/util/timeout.py
index cec817e6..cec817e6 100644
--- a/urllib3/util/timeout.py
+++ b/src/urllib3/util/timeout.py
diff --git a/urllib3/util/url.py b/src/urllib3/util/url.py
index 6b6f9968..6b6f9968 100644
--- a/urllib3/util/url.py
+++ b/src/urllib3/util/url.py
diff --git a/urllib3/util/wait.py b/src/urllib3/util/wait.py
index 4db71baf..4db71baf 100644
--- a/urllib3/util/wait.py
+++ b/src/urllib3/util/wait.py