diff options
| author | Lennart Regebro <regebro@gmail.com> | 2012-08-24 15:32:18 +0200 |
|---|---|---|
| committer | Lennart Regebro <regebro@gmail.com> | 2012-08-24 15:32:18 +0200 |
| commit | bddf70b7ebf990f88af9665c1da29d745da163f8 (patch) | |
| tree | b16664f09e118015da936373f08b79af1e27b00b /setuptools/tests | |
| parent | 0d962727403be73b0b1eac234ed81b941dd7cae9 (diff) | |
| parent | 0e095bea8335a02f3e9ca868a5f689b79fc1aca9 (diff) | |
| download | python-setuptools-git-bddf70b7ebf990f88af9665c1da29d745da163f8.tar.gz | |
Merge.
--HG--
branch : distribute
extra : rebase_source : 0102b3983fb3f3201c8d2819b5a1120da2cc0047
Diffstat (limited to 'setuptools/tests')
| -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 daccaba9..b2ab7acc 100644 --- a/setuptools/tests/server.py +++ b/setuptools/tests/server.py @@ -35,7 +35,7 @@ class IndexServer(HTTPServer): def stop(self): "Stop the server" - # Let the server finish the last request adn wait for a new one. + # Let the server finish the last request and wait for a new one. time.sleep(0.1) # self.shutdown is not supported on python < 2.6, so just |