summaryrefslogtreecommitdiff
path: root/indra/llcommon/tests
diff options
context:
space:
mode:
authorJonathan "Geenz" Goodman <geenz@geenzo.com>2023-07-31 02:38:13 -0700
committerJonathan "Geenz" Goodman <geenz@geenzo.com>2023-07-31 02:38:13 -0700
commitf4a6a434fab9bbce34e5c11408323967c5b5e22e (patch)
tree8269201e5045d0d4ae18a9af6fa3db3ffa54a881 /indra/llcommon/tests
parent3d73326516c73f880f46e28f14b6c515307ede91 (diff)
parentca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (diff)
Merge branch 'DRTVWR-559' into DRTVWR-583
Diffstat (limited to 'indra/llcommon/tests')
-rw-r--r--indra/llcommon/tests/llleap_test.cpp2
-rw-r--r--indra/llcommon/tests/llsdserialize_test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp
index 7ee36a9ea6..60005fc6a9 100644
--- a/indra/llcommon/tests/llleap_test.cpp
+++ b/indra/llcommon/tests/llleap_test.cpp
@@ -109,7 +109,7 @@ namespace tut
"import os\n"
"import sys\n"
"\n"
- "from llbase import llsd\n"
+ "import llsd\n"
"\n"
"class ProtocolError(Exception):\n"
" def __init__(self, msg, data):\n"
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index 5dbcf4c9b8..d7c11c5021 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1706,7 +1706,7 @@ namespace tut
// scanner.
import_llsd("import os.path\n"
"import sys\n"
- "from llbase import llsd\n")
+ "import llsd\n")
{}
~TestPythonCompatible() {}