summaryrefslogtreecommitdiffstats
path: root/keystone/policy
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2013-05-01 10:46:42 -0500
committerDolph Mathews <dolph.mathews@gmail.com>2013-05-20 09:23:03 -0500
commit8d2b8e6457d5ae0ed1136091cb8c143a96abd614 (patch)
tree4472ca5c4eaea0ca13a1cf71fc8c645b9d51182e /keystone/policy
parent7b99bd63e13d62e7a1bcbcd7033340818b2dfa51 (diff)
downloadkeystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.tar.gz
keystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.tar.xz
keystone-8d2b8e6457d5ae0ed1136091cb8c143a96abd614.zip
get SQL refs from session (bp sql-query-get)
Change-Id: I2200e33868d50bb69089f3108a5a4c061afccd6e
Diffstat (limited to 'keystone/policy')
-rw-r--r--keystone/policy/backends/sql.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/keystone/policy/backends/sql.py b/keystone/policy/backends/sql.py
index 2472c1ed..c1eff268 100644
--- a/keystone/policy/backends/sql.py
+++ b/keystone/policy/backends/sql.py
@@ -53,10 +53,10 @@ class Policy(sql.Base, rules.Policy):
def _get_policy(self, session, policy_id):
"""Private method to get a policy model object (NOT a dictionary)."""
- try:
- return session.query(PolicyModel).filter_by(id=policy_id).one()
- except sql.NotFound:
+ ref = session.query(PolicyModel).get(policy_id)
+ if not ref:
raise exception.PolicyNotFound(policy_id=policy_id)
+ return ref
def get_policy(self, policy_id):
session = self.get_session()