diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-06 12:22:55 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-06 12:22:55 -0500 |
| commit | 59f2055c8d99afb1a5ff9ac998b08f0383365e00 (patch) | |
| tree | 51515f9c0ff1013a9ffa60be10addc2c36a86d87 /indra/llcorehttp | |
| parent | 295a4c63b4912f05a729178e8e34ba26e92ff37b (diff) | |
| parent | 780120dc46e6b99135bfd68dfdc05bd3e133208c (diff) | |
merge changes for latest fixes from nat
Diffstat (limited to 'indra/llcorehttp')
| -rwxr-xr-x | indra/llcorehttp/tests/test_llcorehttp_peer.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py index 3ec9cd7d4c..caa204b519 100755 --- a/indra/llcorehttp/tests/test_llcorehttp_peer.py +++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py @@ -40,7 +40,6 @@ try: except ImportError: from StringIO import StringIO from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler -from SocketServer import ThreadingMixIn from llbase.fastest_elementtree import parse as xml_parse from llbase import llsd @@ -274,7 +273,7 @@ class TestHTTPRequestHandler(BaseHTTPRequestHandler): # Suppress error output as well pass -class Server(ThreadingMixIn, HTTPServer): +class Server(HTTPServer): # This pernicious flag is on by default in HTTPServer. But proper # operation of freeport() absolutely depends on it being off. allow_reuse_address = False |