diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-04-30 08:57:29 -0400 |
| commit | 889d02b52d9d53b59e1bab953b8e19a60c49fd4f (patch) | |
| tree | 7991f8b9b0972027cc2bc7301a99779e9850141f /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | ca7de31a6c5031bb928d283362e96bb63e37ce85 (diff) | |
| parent | 2ef8fc41e74b6949e02a7715b2b8399094ebd3ea (diff) | |
merge changes for CHOP-913
Diffstat (limited to 'indra/llcommon/tests/llsdserialize_test.cpp')
| -rwxr-xr-x | 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 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() {} |