Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
9fc70491
Commit
9fc70491
authored
17 years ago
by
Ryan Williams
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
indra/lib/python/indra/base/llsd.py
+2
-3
2 additions, 3 deletions
indra/lib/python/indra/base/llsd.py
indra/lib/python/indra/base/lluuid.py
+1
-1
1 addition, 1 deletion
indra/lib/python/indra/base/lluuid.py
with
3 additions
and
4 deletions
indra/lib/python/indra/base/llsd.py
+
2
−
3
View file @
9fc70491
...
@@ -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
'
)
...
...
This diff is collapsed.
Click to expand it.
indra/lib/python/indra/base/lluuid.py
+
1
−
1
View file @
9fc70491
...
@@ -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
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment