Bug 1432390 - Vendor requests-unixsocket. r=dustin
authorMike Hommey <mh+mozilla@glandium.org>
Sun, 14 Jan 2018 07:01:26 +0900
changeset 400907 557157d299f2f98d99710f5f30cffe2904637d7d
parent 400906 c20dd87101e6be39c05f8b9916eb15c386073d17
child 400908 28bbbfd93724c0001aa0ae37c9ddc2f04ff31bcf
push id33320
push userdluca@mozilla.com
push dateFri, 26 Jan 2018 01:54:08 +0000
treeherdermozilla-central@723b25eb3dd8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdustin
bugs1432390
milestone60.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1432390 - Vendor requests-unixsocket. r=dustin
build/virtualenv_packages.txt
third_party/python/moz.build
third_party/python/requests-unixsocket/.travis.yml
third_party/python/requests-unixsocket/AUTHORS
third_party/python/requests-unixsocket/ChangeLog
third_party/python/requests-unixsocket/LICENSE
third_party/python/requests-unixsocket/PKG-INFO
third_party/python/requests-unixsocket/README.rst
third_party/python/requests-unixsocket/pytest.ini
third_party/python/requests-unixsocket/requests_unixsocket/__init__.py
third_party/python/requests-unixsocket/requests_unixsocket/adapters.py
third_party/python/requests-unixsocket/requests_unixsocket/tests/test_requests_unixsocket.py
third_party/python/requests-unixsocket/requests_unixsocket/testutils.py
third_party/python/requests-unixsocket/requirements.txt
third_party/python/requests-unixsocket/setup.cfg
third_party/python/requests-unixsocket/setup.py
third_party/python/requests-unixsocket/test-requirements.txt
third_party/python/requests-unixsocket/tox.ini
--- a/build/virtualenv_packages.txt
+++ b/build/virtualenv_packages.txt
@@ -16,16 +16,17 @@ mozilla.pth:third_party/python/hglib
 mozilla.pth:third_party/python/jsmin
 optional:setup.py:third_party/python/psutil:build_ext:--inplace
 mozilla.pth:third_party/python/psutil
 mozilla.pth:third_party/python/pylru
 mozilla.pth:third_party/python/which
 mozilla.pth:third_party/python/pystache
 mozilla.pth:third_party/python/pyyaml/lib
 mozilla.pth:third_party/python/requests
+mozilla.pth:third_party/python/requests-unixsocket
 mozilla.pth:third_party/python/slugid
 mozilla.pth:third_party/python/py
 mozilla.pth:third_party/python/pytest
 mozilla.pth:third_party/python/pytoml
 mozilla.pth:third_party/python/redo
 mozilla.pth:third_party/python/six
 mozilla.pth:third_party/python/voluptuous
 mozilla.pth:third_party/python/json-e
--- a/third_party/python/moz.build
+++ b/third_party/python/moz.build
@@ -63,17 +63,17 @@ with Files('pytoml/**'):
     BUG_COMPONENT = ('Core', 'Build Config')
 
 with Files('pyyaml/**'):
     BUG_COMPONENT = ('Taskcluster', 'General')
 
 with Files('redo/**'):
     BUG_COMPONENT = ('Core', 'Build Config')
 
-with Files('requests/**'):
+with Files('requests*/**'):
     BUG_COMPONENT = ('Core', 'Build Config')
 
 with Files('rsa/**'):
     BUG_COMPONENT = ('Core', 'Security: PSM')
 
 with Files('slugid/**'):
     BUG_COMPONENT = ('Taskcluster', 'Platform Libraries')
 
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/.travis.yml
@@ -0,0 +1,17 @@
+language: python
+
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
+    - TOXENV=py35
+    - TOXENV=pypy
+    - TOXENV=flake8
+    - TOXENV=coverage
+
+install:
+    - travis_retry pip install tox
+
+script:
+    - tox
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/AUTHORS
@@ -0,0 +1,6 @@
+Ben Jackson <puremourning@gmail.com>
+Esben Haabendal <esben@haabendal.dk>
+Marc Abramowitz <marc@marc-abramowitz.com>
+Tomaz Solc <tomaz.solc@tablix.org>
+Will Rouesnel <w.rouesnel@gmail.com>
+William Rouesnel <William.Rouesnel@netregistry.com.au>
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/ChangeLog
@@ -0,0 +1,67 @@
+CHANGES
+=======
+
+0.1.5
+-----
+
+* Fix test_unix_domain_adapter_connection_proxies_error
+* .travis.yml tweaks
+* Remove py32; Add py35
+* Only reject proxies if they are relevant (which should be never)
+* Add urllib3 requirement
+* Add basic tests for all supported methods
+* More PEP8 compliance refactoring
+* Fix up some oversights in method parsing
+* Tweak a few things in PR 12
+* Make PEP8 compliant with autopep8
+* Improve the monkey-patching library to replicate requests more closely
+
+0.1.4
+-----
+
+* README.rst: Add PyPI badge
+* Monkeypatch requests.request
+
+0.1.3
+-----
+
+* Fix #6 ("GET parameters stripped from URL")
+* GH-7: Fallback to import from urllib3
+
+0.1.2
+-----
+
+* Tweak monkeypatch code
+* Move/expose testutils like UnixSocketServerThread
+* Make monkeypatch url_scheme arg optional
+
+0.1.1
+-----
+
+* Remove :class: role from README.rst
+
+0.1.0
+-----
+
+* Doc tweaks
+* Expose Session and monkeypatch
+* Add Travis CI build badge
+* Test Python 3.2 with tox and Travis CI
+* Use threading.Event to less chance of race cond
+* Add .travis.yml for Travis CI
+* Change process => thread for test UnixSocketServer
+* Make WSGIApp use server attribute for shutdown
+* Use WSGIApp callable instead of closure
+* In tests, try to gracefully kill waitress server
+* Display text coverage report in tox coverage env
+* Add test for proxies error
+* Use b literal in test; fix py3 test failures
+* tox.ini: Correct name of env pep8 => flake8
+* tox.ini: Rename pep8 => flake8
+* .gitignore: Add AUTHORS and ChangeLog
+* Add pytest-pep8
+* Improve tests
+* Yay, tests are passing
+* .gitignore: Add .eggs/ for setuptools==7.0
+* Rename README.md -> README.rst
+* Initial commit
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/LICENSE
@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/PKG-INFO
@@ -0,0 +1,84 @@
+Metadata-Version: 1.1
+Name: requests-unixsocket
+Version: 0.1.5
+Summary: Use requests to talk HTTP via a UNIX domain socket
+Home-page: https://github.com/msabramo/requests-unixsocket
+Author: Marc Abramowitz
+Author-email: marc@marc-abramowitz.com
+License: Apache-2
+Description: requests-unixsocket
+        ===================
+        
+        .. image:: https://pypip.in/version/requests-unixsocket/badge.svg?style=flat
+            :target: https://pypi.python.org/pypi/requests-unixsocket/
+            :alt: Latest Version
+        
+        .. image:: https://travis-ci.org/msabramo/requests-unixsocket.svg?branch=master
+            :target: https://travis-ci.org/msabramo/requests-unixsocket
+        
+        Use `requests <http://docs.python-requests.org/>`_ to talk HTTP via a UNIX domain socket
+        
+        Usage
+        -----
+        
+        Explicit
+        ++++++++
+        
+        You can use it by instantiating a special ``Session`` object:
+        
+        .. code-block:: python
+        
+            import requests_unixsocket
+        
+            session = requests_unixsocket.Session()
+        
+            # Access /path/to/page from /tmp/profilesvc.sock
+            r = session.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+            assert r.status_code == 200
+        
+        Implicit (monkeypatching)
+        +++++++++++++++++++++++++
+        
+        Monkeypatching allows you to use the functionality in this module, while making
+        minimal changes to your code. Note that in the above example we had to
+        instantiate a special ``requests_unixsocket.Session`` object and call the
+        ``get`` method on that object. Calling ``requests.get(url)`` (the easiest way
+        to use requests and probably very common), would not work. But we can make it
+        work by doing monkeypatching.
+        
+        You can monkeypatch globally:
+        
+        .. code-block:: python
+        
+            import requests_unixsocket
+        
+            requests_unixsocket.monkeypatch()
+        
+            # Access /path/to/page from /tmp/profilesvc.sock
+            r = requests.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+            assert r.status_code == 200
+        
+        or you can do it temporarily using a context manager:
+        
+        .. code-block:: python
+        
+            import requests_unixsocket
+        
+            with requests_unixsocket.monkeypatch():
+                # Access /path/to/page from /tmp/profilesvc.sock
+                r = requests.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+                assert r.status_code == 200
+        
+        
+Platform: UNKNOWN
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Intended Audience :: Information Technology
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 2
+Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 2.6
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.3
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/README.rst
@@ -0,0 +1,62 @@
+requests-unixsocket
+===================
+
+.. image:: https://pypip.in/version/requests-unixsocket/badge.svg?style=flat
+    :target: https://pypi.python.org/pypi/requests-unixsocket/
+    :alt: Latest Version
+
+.. image:: https://travis-ci.org/msabramo/requests-unixsocket.svg?branch=master
+    :target: https://travis-ci.org/msabramo/requests-unixsocket
+
+Use `requests <http://docs.python-requests.org/>`_ to talk HTTP via a UNIX domain socket
+
+Usage
+-----
+
+Explicit
+++++++++
+
+You can use it by instantiating a special ``Session`` object:
+
+.. code-block:: python
+
+    import requests_unixsocket
+
+    session = requests_unixsocket.Session()
+
+    # Access /path/to/page from /tmp/profilesvc.sock
+    r = session.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+    assert r.status_code == 200
+
+Implicit (monkeypatching)
++++++++++++++++++++++++++
+
+Monkeypatching allows you to use the functionality in this module, while making
+minimal changes to your code. Note that in the above example we had to
+instantiate a special ``requests_unixsocket.Session`` object and call the
+``get`` method on that object. Calling ``requests.get(url)`` (the easiest way
+to use requests and probably very common), would not work. But we can make it
+work by doing monkeypatching.
+
+You can monkeypatch globally:
+
+.. code-block:: python
+
+    import requests_unixsocket
+
+    requests_unixsocket.monkeypatch()
+
+    # Access /path/to/page from /tmp/profilesvc.sock
+    r = requests.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+    assert r.status_code == 200
+
+or you can do it temporarily using a context manager:
+
+.. code-block:: python
+
+    import requests_unixsocket
+
+    with requests_unixsocket.monkeypatch():
+        # Access /path/to/page from /tmp/profilesvc.sock
+        r = requests.get('http+unix://%2Ftmp%2Fprofilesvc.sock/path/to/page')
+        assert r.status_code == 200
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --tb=short --pep8
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/requests_unixsocket/__init__.py
@@ -0,0 +1,77 @@
+import requests
+import sys
+
+from .adapters import UnixAdapter
+
+DEFAULT_SCHEME = 'http+unix://'
+
+
+class Session(requests.Session):
+    def __init__(self, url_scheme=DEFAULT_SCHEME, *args, **kwargs):
+        super(Session, self).__init__(*args, **kwargs)
+        self.mount(url_scheme, UnixAdapter())
+
+
+class monkeypatch(object):
+    def __init__(self, url_scheme=DEFAULT_SCHEME):
+        self.session = Session()
+        requests = self._get_global_requests_module()
+
+        # Methods to replace
+        self.methods = ('request', 'get', 'head', 'post',
+                        'patch', 'put', 'delete', 'options')
+        # Store the original methods
+        self.orig_methods = dict(
+            (m, requests.__dict__[m]) for m in self.methods)
+        # Monkey patch
+        g = globals()
+        for m in self.methods:
+            requests.__dict__[m] = g[m]
+
+    def _get_global_requests_module(self):
+        return sys.modules['requests']
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        requests = self._get_global_requests_module()
+        for m in self.methods:
+            requests.__dict__[m] = self.orig_methods[m]
+
+
+# These are the same methods defined for the global requests object
+def request(method, url, **kwargs):
+    session = Session()
+    return session.request(method=method, url=url, **kwargs)
+
+
+def get(url, **kwargs):
+    kwargs.setdefault('allow_redirects', True)
+    return request('get', url, **kwargs)
+
+
+def head(url, **kwargs):
+    kwargs.setdefault('allow_redirects', False)
+    return request('head', url, **kwargs)
+
+
+def post(url, data=None, json=None, **kwargs):
+    return request('post', url, data=data, json=json, **kwargs)
+
+
+def patch(url, data=None, **kwargs):
+    return request('patch', url, data=data, **kwargs)
+
+
+def put(url, data=None, **kwargs):
+    return request('put', url, data=data, **kwargs)
+
+
+def delete(url, **kwargs):
+    return request('delete', url, **kwargs)
+
+
+def options(url, **kwargs):
+    kwargs.setdefault('allow_redirects', True)
+    return request('options', url, **kwargs)
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/requests_unixsocket/adapters.py
@@ -0,0 +1,60 @@
+import socket
+
+from requests.adapters import HTTPAdapter
+from requests.compat import urlparse, unquote
+try:
+    from requests.packages.urllib3.connection import HTTPConnection
+    from requests.packages.urllib3.connectionpool import HTTPConnectionPool
+except ImportError:
+    from urllib3.connection import HTTPConnection
+    from urllib3.connectionpool import HTTPConnectionPool
+
+
+# The following was adapted from some code from docker-py
+# https://github.com/docker/docker-py/blob/master/docker/unixconn/unixconn.py
+class UnixHTTPConnection(HTTPConnection):
+
+    def __init__(self, unix_socket_url, timeout=60):
+        """Create an HTTP connection to a unix domain socket
+
+        :param unix_socket_url: A URL with a scheme of 'http+unix' and the
+        netloc is a percent-encoded path to a unix domain socket. E.g.:
+        'http+unix://%2Ftmp%2Fprofilesvc.sock/status/pid'
+        """
+        HTTPConnection.__init__(self, 'localhost', timeout=timeout)
+        self.unix_socket_url = unix_socket_url
+        self.timeout = timeout
+
+    def connect(self):
+        sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        sock.settimeout(self.timeout)
+        socket_path = unquote(urlparse(self.unix_socket_url).netloc)
+        sock.connect(socket_path)
+        self.sock = sock
+
+
+class UnixHTTPConnectionPool(HTTPConnectionPool):
+
+    def __init__(self, socket_path, timeout=60):
+        HTTPConnectionPool.__init__(self, 'localhost', timeout=timeout)
+        self.socket_path = socket_path
+        self.timeout = timeout
+
+    def _new_conn(self):
+        return UnixHTTPConnection(self.socket_path, self.timeout)
+
+
+class UnixAdapter(HTTPAdapter):
+
+    def __init__(self, timeout=60):
+        super(UnixAdapter, self).__init__()
+        self.timeout = timeout
+
+    def get_connection(self, socket_path, proxies=None):
+        proxies = proxies or {}
+        proxy = proxies.get(urlparse(socket_path.lower()).scheme)
+
+        if proxy:
+            raise ValueError('%s does not support specifying proxies'
+                             % self.__class__.__name__)
+        return UnixHTTPConnectionPool(socket_path, self.timeout)
new file mode 100755
--- /dev/null
+++ b/third_party/python/requests-unixsocket/requests_unixsocket/tests/test_requests_unixsocket.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Tests for requests_unixsocket"""
+
+import logging
+
+import pytest
+import requests
+
+import requests_unixsocket
+from requests_unixsocket.testutils import UnixSocketServerThread
+
+
+logger = logging.getLogger(__name__)
+
+
+def test_unix_domain_adapter_ok():
+    with UnixSocketServerThread() as usock_thread:
+        session = requests_unixsocket.Session('http+unix://')
+        urlencoded_usock = requests.compat.quote_plus(usock_thread.usock)
+        url = 'http+unix://%s/path/to/page' % urlencoded_usock
+
+        for method in ['get', 'post', 'head', 'patch', 'put', 'delete',
+                       'options']:
+            logger.debug('Calling session.%s(%r) ...', method, url)
+            r = getattr(session, method)(url)
+            logger.debug(
+                'Received response: %r with text: %r and headers: %r',
+                r, r.text, r.headers)
+            assert r.status_code == 200
+            assert r.headers['server'] == 'waitress'
+            assert r.headers['X-Transport'] == 'unix domain socket'
+            assert r.headers['X-Requested-Path'] == '/path/to/page'
+            assert r.headers['X-Socket-Path'] == usock_thread.usock
+            assert isinstance(r.connection, requests_unixsocket.UnixAdapter)
+            assert r.url == url
+            if method == 'head':
+                assert r.text == ''
+            else:
+                assert r.text == 'Hello world!'
+
+
+def test_unix_domain_adapter_url_with_query_params():
+    with UnixSocketServerThread() as usock_thread:
+        session = requests_unixsocket.Session('http+unix://')
+        urlencoded_usock = requests.compat.quote_plus(usock_thread.usock)
+        url = ('http+unix://%s'
+               '/containers/nginx/logs?timestamp=true' % urlencoded_usock)
+
+        for method in ['get', 'post', 'head', 'patch', 'put', 'delete',
+                       'options']:
+            logger.debug('Calling session.%s(%r) ...', method, url)
+            r = getattr(session, method)(url)
+            logger.debug(
+                'Received response: %r with text: %r and headers: %r',
+                r, r.text, r.headers)
+            assert r.status_code == 200
+            assert r.headers['server'] == 'waitress'
+            assert r.headers['X-Transport'] == 'unix domain socket'
+            assert r.headers['X-Requested-Path'] == '/containers/nginx/logs'
+            assert r.headers['X-Requested-Query-String'] == 'timestamp=true'
+            assert r.headers['X-Socket-Path'] == usock_thread.usock
+            assert isinstance(r.connection, requests_unixsocket.UnixAdapter)
+            assert r.url == url
+            if method == 'head':
+                assert r.text == ''
+            else:
+                assert r.text == 'Hello world!'
+
+
+def test_unix_domain_adapter_connection_error():
+    session = requests_unixsocket.Session('http+unix://')
+
+    for method in ['get', 'post', 'head', 'patch', 'put', 'delete', 'options']:
+        with pytest.raises(requests.ConnectionError):
+            getattr(session, method)(
+                'http+unix://socket_does_not_exist/path/to/page')
+
+
+def test_unix_domain_adapter_connection_proxies_error():
+    session = requests_unixsocket.Session('http+unix://')
+
+    for method in ['get', 'post', 'head', 'patch', 'put', 'delete', 'options']:
+        with pytest.raises(ValueError) as excinfo:
+            getattr(session, method)(
+                'http+unix://socket_does_not_exist/path/to/page',
+                proxies={"http+unix": "http://10.10.1.10:1080"})
+        assert ('UnixAdapter does not support specifying proxies'
+                in str(excinfo.value))
+
+
+def test_unix_domain_adapter_monkeypatch():
+    with UnixSocketServerThread() as usock_thread:
+        with requests_unixsocket.monkeypatch('http+unix://'):
+            urlencoded_usock = requests.compat.quote_plus(usock_thread.usock)
+            url = 'http+unix://%s/path/to/page' % urlencoded_usock
+
+            for method in ['get', 'post', 'head', 'patch', 'put', 'delete',
+                           'options']:
+                logger.debug('Calling session.%s(%r) ...', method, url)
+                r = getattr(requests, method)(url)
+                logger.debug(
+                    'Received response: %r with text: %r and headers: %r',
+                    r, r.text, r.headers)
+                assert r.status_code == 200
+                assert r.headers['server'] == 'waitress'
+                assert r.headers['X-Transport'] == 'unix domain socket'
+                assert r.headers['X-Requested-Path'] == '/path/to/page'
+                assert r.headers['X-Socket-Path'] == usock_thread.usock
+                assert isinstance(r.connection,
+                                  requests_unixsocket.UnixAdapter)
+                assert r.url == url
+                if method == 'head':
+                    assert r.text == ''
+                else:
+                    assert r.text == 'Hello world!'
+
+    for method in ['get', 'post', 'head', 'patch', 'put', 'delete', 'options']:
+        with pytest.raises(requests.exceptions.InvalidSchema):
+            getattr(requests, method)(url)
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/requests_unixsocket/testutils.py
@@ -0,0 +1,97 @@
+"""
+Utilities helpful for writing tests
+
+Provides a UnixSocketServerThread that creates a running server, listening on a
+newly created unix socket.
+
+Example usage:
+
+.. code-block:: python
+
+    def test_unix_domain_adapter_monkeypatch():
+        with UnixSocketServerThread() as usock_thread:
+            with requests_unixsocket.monkeypatch('http+unix://'):
+                urlencoded_usock = quote_plus(usock_process.usock)
+                url = 'http+unix://%s/path/to/page' % urlencoded_usock
+                r = requests.get(url)
+"""
+
+import logging
+import os
+import threading
+import time
+import uuid
+import waitress
+
+
+logger = logging.getLogger(__name__)
+
+
+class KillThread(threading.Thread):
+    def __init__(self, server, *args, **kwargs):
+        super(KillThread, self).__init__(*args, **kwargs)
+        self.server = server
+
+    def run(self):
+        time.sleep(1)
+        logger.debug('Sleeping')
+        self.server._map.clear()
+
+
+class WSGIApp:
+    server = None
+
+    def __call__(self, environ, start_response):
+        logger.debug('WSGIApp.__call__: Invoked for %s', environ['PATH_INFO'])
+        logger.debug('WSGIApp.__call__: environ = %r', environ)
+        status_text = '200 OK'
+        response_headers = [
+            ('X-Transport', 'unix domain socket'),
+            ('X-Socket-Path', environ['SERVER_PORT']),
+            ('X-Requested-Query-String', environ['QUERY_STRING']),
+            ('X-Requested-Path', environ['PATH_INFO'])]
+        body_bytes = b'Hello world!'
+        start_response(status_text, response_headers)
+        logger.debug(
+            'WSGIApp.__call__: Responding with '
+            'status_text = %r; '
+            'response_headers = %r; '
+            'body_bytes = %r',
+            status_text, response_headers, body_bytes)
+        return [body_bytes]
+
+
+class UnixSocketServerThread(threading.Thread):
+    def __init__(self, *args, **kwargs):
+        super(UnixSocketServerThread, self).__init__(*args, **kwargs)
+        self.usock = self.get_tempfile_name()
+        self.server = None
+        self.server_ready_event = threading.Event()
+
+    def get_tempfile_name(self):
+        # I'd rather use tempfile.NamedTemporaryFile but IDNA limits
+        # the hostname to 63 characters and we'll get a "InvalidURL:
+        # URL has an invalid label" error if we exceed that.
+        args = (os.stat(__file__).st_ino, os.getpid(), uuid.uuid4().hex[-8:])
+        return '/tmp/test_requests.%s_%s_%s' % args
+
+    def run(self):
+        logger.debug('Call waitress.serve in %r ...', self)
+        wsgi_app = WSGIApp()
+        server = waitress.create_server(wsgi_app, unix_socket=self.usock)
+        wsgi_app.server = server
+        self.server = server
+        self.server_ready_event.set()
+        server.run()
+
+    def __enter__(self):
+        logger.debug('Starting %r ...' % self)
+        self.start()
+        logger.debug('Started %r.', self)
+        self.server_ready_event.wait()
+        return self
+
+    def __exit__(self, *args):
+        self.server_ready_event.wait()
+        if self.server:
+            KillThread(self.server).start()
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/requirements.txt
@@ -0,0 +1,2 @@
+requests>=1.1
+urllib3>=1.8
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/setup.cfg
@@ -0,0 +1,33 @@
+[metadata]
+name = requests-unixsocket
+author = Marc Abramowitz
+author-email = marc@marc-abramowitz.com
+summary = Use requests to talk HTTP via a UNIX domain socket
+description-file = README.rst
+license = Apache-2
+home-page = https://github.com/msabramo/requests-unixsocket
+classifier = 
+	Development Status :: 3 - Alpha
+	Intended Audience :: Developers
+	Intended Audience :: Information Technology
+	License :: OSI Approved :: Apache Software License
+	Operating System :: OS Independent
+	Programming Language :: Python
+	Programming Language :: Python :: 2
+	Programming Language :: Python :: 2.7
+	Programming Language :: Python :: 2.6
+	Programming Language :: Python :: 3
+	Programming Language :: Python :: 3.3
+test_suite = requests_unixsocket.tests
+
+[files]
+packages = requests_unixsocket
+
+[wheel]
+universal = 1
+
+[egg_info]
+tag_build = 
+tag_date = 0
+tag_svn_revision = 0
+
new file mode 100755
--- /dev/null
+++ b/third_party/python/requests-unixsocket/setup.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+setup(
+    setup_requires=['pbr'],
+    pbr=True,
+)
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/test-requirements.txt
@@ -0,0 +1,4 @@
+pytest
+pytest-capturelog
+pytest-pep8
+waitress
new file mode 100644
--- /dev/null
+++ b/third_party/python/requests-unixsocket/tox.ini
@@ -0,0 +1,48 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, pypy, flake8
+
+[testenv]
+commands = py.test {posargs:requests_unixsocket/tests}
+deps =
+    -r{toxinidir}/requirements.txt
+    -r{toxinidir}/test-requirements.txt
+
+[testenv:flake8]
+commands = flake8
+deps =
+    flake8
+    {[testenv]deps}
+
+[testenv:venv]
+commands = {posargs}
+
+[testenv:coverage]
+commands =
+    coverage erase
+    coverage run --source requests_unixsocket -m py.test requests_unixsocket/tests
+    coverage report --show-missing
+    coverage html
+deps =
+    coverage
+    {[testenv]deps}
+
+[testenv:doctest]
+# note this only works under python 3 because of unicode literals
+commands =
+    python -m doctest README.rst
+
+[testenv:sphinx-doctest]
+# note this only works under python 3 because of unicode literals
+commands =
+    mkdir build/sphinx/doctest
+    sphinx-build -b doctest docs build/sphinx/doctest
+deps =
+    pbr
+    {[testenv]deps}
+
+[testenv:docs]
+commands = python setup.py build_sphinx
+
+[flake8]
+max_line_length = 79
+exclude = .git,.tox,dist,docs,*egg