diff options
| author | simon <none@none> | 2013-05-09 13:21:22 -0700 |
|---|---|---|
| committer | simon <none@none> | 2013-05-09 13:21:22 -0700 |
| commit | 8895e795763d14c3dae495b3648da3d4a52ba30a (patch) | |
| tree | efdb765ff9c99ab179bf252aa0cee87e6ac410e7 /indra/llcommon/tests/llsdserialize_test.cpp | |
| parent | 35f7a750836b72cb116e60b315ca32664911001b (diff) | |
| parent | c7f7c4bc4d9155f5e9cd83265e189f689739da62 (diff) | |
Merge downstream code / viewer-beta
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() {} |