Skip to content
Snippets Groups Projects
Commit 9fc70491 authored by Ryan Williams's avatar Ryan Williams
Browse files

This should hide the problem in SL-56900. Reviewed by Donovan.

parent 7ba02141
No related branches found
No related tags found
No related merge requests found
...@@ -680,7 +680,7 @@ def _parse_string(self, delim): ...@@ -680,7 +680,7 @@ def _parse_string(self, delim):
def _parse_string_delim(self, delim): def _parse_string_delim(self, delim):
""" string: "g'day" | 'have a "nice" day' """ """ string: "g'day 'un" | 'have a "nice" day' """
list = [] list = []
found_escape = False found_escape = False
found_hex = False found_hex = False
...@@ -838,9 +838,8 @@ def __str__(self): ...@@ -838,9 +838,8 @@ def __str__(self):
# register converters for stacked, if stacked is available # register converters for stacked, if stacked is available
try: try:
from mulib import stacked from mulib import stacked
except ImportError, e: except:
print "Not able to import stacked, skipping registering llsd converters." print "Not able to import stacked, skipping registering llsd converters."
pass # don't bother with the converters
else: else:
def llsd_convert_json(llsd_stuff, request): def llsd_convert_json(llsd_stuff, request):
callback = request.get_header('callback') callback = request.get_header('callback')
......
...@@ -279,7 +279,7 @@ def uuid_bits_to_uuid(bits): ...@@ -279,7 +279,7 @@ def uuid_bits_to_uuid(bits):
try: try:
from mulib import stacked from mulib import stacked
except ImportError: except:
print "Couldn't import mulib, not registering UUID converter" print "Couldn't import mulib, not registering UUID converter"
else: else:
def convertUUID(uuid, req): def convertUUID(uuid, req):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment