diff options
| author | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
|---|---|---|
| committer | JJ Linden <jj@lindenlab.com> | 2013-05-15 14:57:56 -0700 |
| commit | a606a1cd68bd858c711856702185ae11194c6311 (patch) | |
| tree | 2c060215b7ddc02492d715cae6b48d5f3c26f335 /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | 435bda9df464ef7faaf8329ffa094dca9e82a6a4 (diff) | |
| parent | 50e3b7da42ddbae409f0a2bdbc322da96941fa07 (diff) | |
merged in branch for changing BuildParams
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() {} |