diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-07-21 14:03:19 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-07-21 14:03:19 -0700 |
commit | 5ab6b73d57818c7aaf9a4bcd0b302854166fd93a (patch) | |
tree | 62b803e088045a401e7b3f7cbbb489839e4b0622 /indra | |
parent | eb350761f7e0b514f785917dcd9649a4a85db8fc (diff) |
MAINT-6585: redirect elementtree to llbase version
Diffstat (limited to 'indra')
-rwxr-xr-x | indra/llcorehttp/tests/test_llcorehttp_peer.py | 4 | ||||
-rwxr-xr-x | indra/llmessage/tests/test_llsdmessage_peer.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py index 5a059e53ca..6c5f37d407 100755 --- a/indra/llcorehttp/tests/test_llcorehttp_peer.py +++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py @@ -42,9 +42,7 @@ except ImportError: from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler from SocketServer import ThreadingMixIn -mydir = os.path.dirname(__file__) # expected to be .../indra/llcorehttp/tests/ -sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python")) -from indra.util.fastest_elementtree import parse as xml_parse +from llbase.fastest_elementtree import parse as xml_parse from llbase import llsd from testrunner import freeport, run, debug, VERBOSE diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py index 485a125af0..bac18fa374 100755 --- a/indra/llmessage/tests/test_llsdmessage_peer.py +++ b/indra/llmessage/tests/test_llsdmessage_peer.py @@ -34,9 +34,7 @@ import sys from threading import Thread from BaseHTTPServer import HTTPServer, BaseHTTPRequestHandler -mydir = os.path.dirname(__file__) # expected to be .../indra/llmessage/tests/ -sys.path.insert(0, os.path.join(mydir, os.pardir, os.pardir, "lib", "python")) -from indra.util.fastest_elementtree import parse as xml_parse +from llbase.fastest_elementtree import parse as xml_parse from llbase import llsd from testrunner import freeport, run, debug, VERBOSE import time |