diff options
| author | Ryan Williams <rdw@lindenlab.com> | 2007-10-03 23:20:12 +0000 |
|---|---|---|
| committer | Ryan Williams <rdw@lindenlab.com> | 2007-10-03 23:20:12 +0000 |
| commit | 9fc7049151a16e3722c6ce90899e3c7b63161615 (patch) | |
| tree | a790a1cb9fa85561f56ffe10406c563230f173b7 /indra/lib | |
| parent | 7ba0214179b234872f85156890dab99cfc3742a7 (diff) | |
This should hide the problem in SL-56900. Reviewed by Donovan.
Diffstat (limited to 'indra/lib')
| -rw-r--r-- | indra/lib/python/indra/base/llsd.py | 5 | ||||
| -rw-r--r-- | indra/lib/python/indra/base/lluuid.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/lib/python/indra/base/llsd.py b/indra/lib/python/indra/base/llsd.py index 839c148454..e23cdfa986 100644 --- a/indra/lib/python/indra/base/llsd.py +++ b/indra/lib/python/indra/base/llsd.py @@ -680,7 +680,7 @@ class LLSDNotationParser(object): def _parse_string_delim(self, delim): - """ string: "g'day" | 'have a "nice" day' """ + """ string: "g'day 'un" | 'have a "nice" day' """ list = [] found_escape = False found_hex = False @@ -838,9 +838,8 @@ undef = LLSD(None) # register converters for stacked, if stacked is available try: from mulib import stacked -except ImportError, e: +except: print "Not able to import stacked, skipping registering llsd converters." - pass # don't bother with the converters else: def llsd_convert_json(llsd_stuff, request): callback = request.get_header('callback') diff --git a/indra/lib/python/indra/base/lluuid.py b/indra/lib/python/indra/base/lluuid.py index 2793a2a78e..ea60ae74c2 100644 --- a/indra/lib/python/indra/base/lluuid.py +++ b/indra/lib/python/indra/base/lluuid.py @@ -279,7 +279,7 @@ def uuid_bits_to_uuid(bits): try: from mulib import stacked -except ImportError: +except: print "Couldn't import mulib, not registering UUID converter" else: def convertUUID(uuid, req): |