diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-23 10:32:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 10:32:22 -0500 |
| commit | 089cdeb489a0fa94d11b7307b54210ef9aa40511 (patch) | |
| tree | ee738b703f1b0737e139b5d10f62e54bd20e1028 /setuptools/tests/server.py | |
| parent | aaec654d804cb78dbb6391afff721a63f26a71cd (diff) | |
| parent | 11676d39c405672270a543bdc32de395b935b869 (diff) | |
| download | external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.gz external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.tar.bz2 external_python_setuptools-089cdeb489a0fa94d11b7307b54210ef9aa40511.zip | |
Merge pull request #933 from pypa/feature/581-depend-not-bundle
Bundle dependencies instead of vendoring them
Diffstat (limited to 'setuptools/tests/server.py')
| -rw-r--r-- | setuptools/tests/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/tests/server.py b/setuptools/tests/server.py index 35312120..5cdde217 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -4,7 +4,7 @@ import time import threading -from setuptools.extern.six.moves import BaseHTTPServer, SimpleHTTPServer +from six.moves import BaseHTTPServer, SimpleHTTPServer class IndexServer(BaseHTTPServer.HTTPServer): |