diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2016-07-27 14:26:48 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2016-07-27 14:26:48 -0700 |
commit | dec92ac3f8c40d8914348d77b96c3b77917f7555 (patch) | |
tree | d7cfa51508ddda12b90d6d637df31ffa3b59ba10 /indra/llmessage | |
parent | f710ab3d3f054160b5c79ba042af12a8c9652677 (diff) | |
parent | 3d5766e491855cd5260dc85a97f06462918d2875 (diff) |
MAINT-6585: pull into fork of viewer-neko for pull request
Diffstat (limited to 'indra/llmessage')
-rwxr-xr-x | indra/llmessage/tests/test_llsdmessage_peer.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py index e45249b1cb..bac18fa374 100755 --- a/indra/llmessage/tests/test_llsdmessage_peer.py +++ b/indra/llmessage/tests/test_llsdmessage_peer.py @@ -34,10 +34,8 @@ 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 indra.base import llsd +from llbase.fastest_elementtree import parse as xml_parse +from llbase import llsd from testrunner import freeport, run, debug, VERBOSE import time |