From e41c4c90f0d8c935fa8e4de6a8439d00283c3206 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 15 Jul 2011 16:01:43 -0400
Subject: [PATCH] Not all TC agents have llbase.llsd, fall back to
indra.base.llsd
---
indra/llcommon/tests/llsdserialize_test.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp
index b0c0df192ca..30cc2bbc8a5 100644
--- a/indra/llcommon/tests/llsdserialize_test.cpp
+++ b/indra/llcommon/tests/llsdserialize_test.cpp
@@ -1802,7 +1802,10 @@ namespace tut
python("read C++ notation",
lambda::_1 <<
- "from llbase import llsd\n"
+ "try:\n"
+ " from llbase import llsd\n"
+ "except ImportError:\n"
+ " from indra.base import llsd\n"
"def parse_each(iterable):\n"
" for item in iterable:\n"
" yield llsd.parse(item)\n" <<
@@ -1823,7 +1826,10 @@ namespace tut
python("write Python notation",
lambda::_1 <<
"from __future__ import with_statement\n"
- "from llbase import llsd\n"
+ "try:\n"
+ " from llbase import llsd\n"
+ "except ImportError:\n"
+ " from indra.base import llsd\n"
"DATA = [\n"
" 17,\n"
" 3.14,\n"
--
GitLab