diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2008-09-29 17:41:54 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2008-09-29 17:41:54 +0000 |
| commit | 66739da16407a8e56accc236bd3996c1963a6bcf (patch) | |
| tree | 2b8e1d8b4560880b8427231dec5f8c11a6ab5ec0 /indra/lib/python/indra/ipc | |
| parent | 13c96cc47ba104483fa6a5f2c2c197f7b66fdecf (diff) | |
Result of svn merge -r97546:97641 svn+ssh://svn/svn/linden/branches/apache-caps/merge-to-release into release. QAR-824
Diffstat (limited to 'indra/lib/python/indra/ipc')
| -rw-r--r-- | indra/lib/python/indra/ipc/llsdhttp.py | 2 | ||||
| -rw-r--r-- | indra/lib/python/indra/ipc/siesta.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/lib/python/indra/ipc/llsdhttp.py b/indra/lib/python/indra/ipc/llsdhttp.py index c45489643e..ea4608c82b 100644 --- a/indra/lib/python/indra/ipc/llsdhttp.py +++ b/indra/lib/python/indra/ipc/llsdhttp.py @@ -51,6 +51,8 @@ request_ = suite.request_ # import every httpc error exception into our namespace for convenience for x in httpc.status_to_error_map.itervalues(): globals()[x.__name__] = x +ConnectionError = httpc.ConnectionError +Retriable = httpc.Retriable for x in (httpc.ConnectionError,): globals()[x.__name__] = x diff --git a/indra/lib/python/indra/ipc/siesta.py b/indra/lib/python/indra/ipc/siesta.py index 5fbea29339..b206f181c4 100644 --- a/indra/lib/python/indra/ipc/siesta.py +++ b/indra/lib/python/indra/ipc/siesta.py @@ -24,9 +24,9 @@ except ImportError: llsd_parsers = { 'application/json': json_decode, - 'application/llsd+binary': llsd.parse_binary, + llsd.BINARY_MIME_TYPE: llsd.parse_binary, 'application/llsd+notation': llsd.parse_notation, - 'application/llsd+xml': llsd.parse_xml, + llsd.XML_MIME_TYPE: llsd.parse_xml, 'application/xml': llsd.parse_xml, } |