diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-24 02:51:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-24 02:51:57 +0000 |
| commit | 0fc0d3389dd5202574c7b8942691acfa608afcb8 (patch) | |
| tree | e6b6f8c95ad1b47252a8dd177344fbc8e607a4d6 /neutron/pecan_wsgi | |
| parent | 30a3b493213097a014704dd7b3da8e0388021302 (diff) | |
| parent | 984f985e89da1478da587322b966b3746971742c (diff) | |
| download | neutron-0fc0d3389dd5202574c7b8942691acfa608afcb8.tar.gz | |
Merge "Don't assume simplejson in pecan exception catch"
Diffstat (limited to 'neutron/pecan_wsgi')
| -rw-r--r-- | neutron/pecan_wsgi/hooks/policy_enforcement.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/neutron/pecan_wsgi/hooks/policy_enforcement.py b/neutron/pecan_wsgi/hooks/policy_enforcement.py index 2985167fa2..0d8022e102 100644 --- a/neutron/pecan_wsgi/hooks/policy_enforcement.py +++ b/neutron/pecan_wsgi/hooks/policy_enforcement.py @@ -14,7 +14,6 @@ # under the License. import copy -import simplejson from oslo_policy import policy as oslo_policy from oslo_utils import excutils @@ -130,7 +129,7 @@ class PolicyHook(hooks.PecanHook): return try: data = state.response.json - except simplejson.JSONDecodeError: + except ValueError: return action = '%s_%s' % (pecan_constants.ACTION_MAP[state.request.method], resource) |