openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Switch to using the type checking decode_json"

Browse Source
This commit is contained in:
Jenkins
2014-02-24 06:50:19 +00:00
committed by Gerrit Code Review
parent 9e0b8225b7 05b3e274ef
commit 75e1aa2ee2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taskflow/persistence/backends/impl_dir.py
View File

@@ -163,7 +163,7 @@ class Connection(base.Connection):
def _get(): def _get():
td_path = os.path.join(self._task_path, uuid) td_path = os.path.join(self._task_path, uuid)
td_data = jsonutils.loads(self._read_from(td_path)) td_data = misc.decode_json(self._read_from(td_path))
return p_utils.unformat_task_detail(uuid, td_data) return p_utils.unformat_task_detail(uuid, td_data)
if lock: if lock:
@@ -176,7 +176,7 @@ class Connection(base.Connection):
def _get(): def _get():
fd_path = os.path.join(self._flow_path, uuid) fd_path = os.path.join(self._flow_path, uuid)
meta_path = os.path.join(fd_path, 'metadata') meta_path = os.path.join(fd_path, 'metadata')
meta = jsonutils.loads(self._read_from(meta_path)) meta = misc.decode_json(self._read_from(meta_path))
fd = p_utils.unformat_flow_detail(uuid, meta) fd = p_utils.unformat_flow_detail(uuid, meta)
td_to_load = [] td_to_load = []
td_path = os.path.join(fd_path, 'tasks') td_path = os.path.join(fd_path, 'tasks')
@@ -350,7 +350,7 @@ class Connection(base.Connection):
book_path = os.path.join(self._book_path, book_uuid) book_path = os.path.join(self._book_path, book_uuid)
meta_path = os.path.join(book_path, 'metadata') meta_path = os.path.join(book_path, 'metadata')
try: try:
meta = jsonutils.loads(self._read_from(meta_path)) meta = misc.decode_json(self._read_from(meta_path))
except EnvironmentError as e: except EnvironmentError as e:
if e.errno == errno.ENOENT: if e.errno == errno.ENOENT:
raise exc.NotFound("No logbook found with id: %s" % book_uuid) raise exc.NotFound("No logbook found with id: %s" % book_uuid)