Skip to content

Commit

Permalink
Merge branch 'master' of github.com:gmr/consulate
Browse files Browse the repository at this point in the history
  • Loading branch information
gmr committed May 20, 2015
2 parents 5f3e3bc + 938f96c commit ff788e9
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions consulate/api/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ def _demarshal(self, body):
if utils.PYTHON3 and isinstance(body, bytes):
body = body.decode('utf-8')
value = json.loads(body, encoding='utf-8')
except (TypeError, ValueError) as error:
print("Error:", error)
except (TypeError, ValueError):
return body
if isinstance(value, bool):
return value
Expand Down

0 comments on commit ff788e9

Please sign in to comment.