diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-05-31 16:35:20 -0400 |
| commit | 8a74efa38ba631be5400c4912a6339310968c9d7 (patch) | |
| tree | 9a76f8b2b31b3184857e29b965beb922fc166772 /indra/llmessage/tests/test_llsdmessage_peer.py | |
| parent | 25c20354b72343410ba0c6e4575a9fbc0671712d (diff) | |
| parent | ed92f1d8034dcaa84f808b3267c772202e7ce113 (diff) | |
SL-18330: Merge branch 'xcode-14.3' into fix-monterey
for strip_deprecated_header(header_size) and Python llsd module fixes.
Diffstat (limited to 'indra/llmessage/tests/test_llsdmessage_peer.py')
| -rwxr-xr-x | indra/llmessage/tests/test_llsdmessage_peer.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py index 5ba0749e31..8e9b6c09e7 100755 --- a/indra/llmessage/tests/test_llsdmessage_peer.py +++ b/indra/llmessage/tests/test_llsdmessage_peer.py @@ -33,8 +33,8 @@ import os import sys from http.server import HTTPServer, BaseHTTPRequestHandler -from llbase.fastest_elementtree import parse as xml_parse -from llbase import llsd +from llsd.fastest_elementtree import parse as xml_parse +import llsd from testrunner import freeport, run, debug, VERBOSE import time |