From 9fc7049151a16e3722c6ce90899e3c7b63161615 Mon Sep 17 00:00:00 2001
From: Ryan Williams <rdw@lindenlab.com>
Date: Wed, 3 Oct 2007 23:20:12 +0000
Subject: [PATCH] This should hide the problem in SL-56900. Reviewed by
Donovan.
---
indra/lib/python/indra/base/llsd.py | 5 ++---
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 839c148454a..e23cdfa9860 100644
--- a/indra/lib/python/indra/base/llsd.py
+++ b/indra/lib/python/indra/base/llsd.py
@@ -680,7 +680,7 @@ def _parse_string(self, delim):
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 @@ def __str__(self):
# 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 2793a2a78e3..ea60ae74c2a 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):
--
GitLab