diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2013-05-03 21:48:17 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2013-05-03 21:48:17 +0000 |
| commit | 06f9f7b2d9d867934d952ac7500711c25f346c1e (patch) | |
| tree | 5fdac0288bf1fb02b640394c6630fdc42f3ccc83 /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | 8d0d645cd66e43a104089729685c3aa6c8c18917 (diff) | |
| parent | 06f5872741d2ba5e5197ba7861c946b18ccf27ab (diff) | |
merge
Diffstat (limited to 'indra/llcommon/tests/llsdserialize_test.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/llcommon/tests/llsdserialize_test.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index e625545763..4d436e8897 100644..100755 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1523,10 +1523,7 @@ namespace tut "sys.path.insert(0,\n" " os.path.join(os.path.dirname(r'" __FILE__ "'),\n" " os.pardir, os.pardir, 'lib', 'python'))\n" - "try:\n" - " from llbase import llsd\n" - "except ImportError:\n" - " from indra.base import llsd\n") + "from indra.base import llsd\n") {} ~TestPythonCompatible() {} |