summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-07-20 11:47:08 -0700
committerGlenn Glazer <coyot@lindenlab.com>2016-07-20 11:47:08 -0700
commit3ea324c1c47dc19f6d6dee813afe498b521010e2 (patch)
tree47abb6edc7381f056fcb0f21f85466d4b8c19354 /indra
parentf868e29945806fd6cefde65067ae2c870ac112a6 (diff)
MAINT=6585: migrate from local python libraries to canonical llbase
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llcorehttp/tests/test_llcorehttp_peer.py2
-rwxr-xr-xindra/llmessage/tests/test_llsdmessage_peer.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 04cde651c4..5a059e53ca 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -45,7 +45,7 @@ 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 indra.base import llsd
+from llbase import llsd
from testrunner import freeport, run, debug, VERBOSE
class TestHTTPRequestHandler(BaseHTTPRequestHandler):
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py
index e45249b1cb..485a125af0 100755
--- a/indra/llmessage/tests/test_llsdmessage_peer.py
+++ b/indra/llmessage/tests/test_llsdmessage_peer.py
@@ -37,7 +37,7 @@ 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 import llsd
from testrunner import freeport, run, debug, VERBOSE
import time