
This patch localizes try...except blocks, DRYs construction of certain HTTP exceptions, and modifies what types of exceptions are thrown (in some cases), to be more precise. I also factored out some input validation code that happened to be mixed up with all the exception handling. Implements: blueprint grizzly-debt Change-Id: I1030308bed1ec55477b176bf022118d53b46b7ff
50 lines
1.3 KiB
Python
50 lines
1.3 KiB
Python
# Copyright (c) 2013 Rackspace, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import simplejson as json
|
|
|
|
|
|
class MalformedJSON(ValueError):
|
|
"""JSON string is not valid."""
|
|
pass
|
|
|
|
|
|
def read_json(stream):
|
|
"""Like json.load, but converts ValueError to MalformedJSON upon failure.
|
|
|
|
:param stream: a file-like object
|
|
"""
|
|
try:
|
|
return json.load(stream)
|
|
|
|
except ValueError as ex:
|
|
raise MalformedJSON(ex.message)
|
|
|
|
|
|
def to_json(obj):
|
|
"""Like json.dumps, but outputs a UTF-8 encoded string.
|
|
|
|
:param obj: a JSON-serializable object
|
|
"""
|
|
return json.dumps(obj, ensure_ascii=False)
|
|
|
|
|
|
def purge(src):
|
|
"""Returns a copy of a dict, excluding any keys set to `None`.
|
|
|
|
:param src: a dictionary-like object to copy
|
|
"""
|
|
return dict([(k, v) for k, v in src.items() if v is not None])
|