From 4e2be8a8880f03b1c6d1dc663d7259dbb45ddf67 Mon Sep 17 00:00:00 2001 From: Dolph Mathews Date: Tue, 11 Dec 2012 14:40:27 -0600 Subject: Move token controller into keystone.token Change-Id: Ie8277529185f645854e0aebaafa173c06a7c5164 --- keystone/common/controller.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'keystone/common') diff --git a/keystone/common/controller.py b/keystone/common/controller.py index 5db57b61..5f351411 100644 --- a/keystone/common/controller.py +++ b/keystone/common/controller.py @@ -55,15 +55,19 @@ def protected(f): return wrapper -class V3Controller(wsgi.Application): - """Base controller class for Identity API v3.""" +class V2Controller(wsgi.Application): + """Base controller class for Identity API v2.""" - def __init__(self, catalog_api, identity_api, token_api, policy_api): + def __init__(self, catalog_api, identity_api, policy_api, token_api): self.catalog_api = catalog_api self.identity_api = identity_api self.policy_api = policy_api self.token_api = token_api - super(V3Controller, self).__init__() + super(V2Controller, self).__init__() + + +class V3Controller(V2Controller): + """Base controller class for Identity API v3.""" def _paginate(self, context, refs): """Paginates a list of references by page & per_page query strings.""" -- cgit