diff options
Diffstat (limited to 'keystone/server.py')
| -rwxr-xr-x | keystone/server.py | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/keystone/server.py b/keystone/server.py index 79ed98af..56cb4482 100755 --- a/keystone/server.py +++ b/keystone/server.py @@ -509,27 +509,18 @@ def get_marker_limit_and_url(req): if "limit" in req.GET: limit = req.GET["limit"] + url = get_url(req) + return (marker, limit, url) -def get_marker_and_limit(req): - marker = None - limit = 10 - - if "marker" in req.GET: - marker = req.GET["marker"] - - if "limit" in req.GET: - limit = req.GET["limit"] - - def get_url(req): - url = '%s://%s:%s%s' % (req.environ['wsgi.url_scheme'], - req.environ.get("SERVER_NAME"), - req.environ.get("SERVER_PORT"), - req.environ['PATH_INFO']) - return url + return '%s://%s:%s%s' % ( + req.environ['wsgi.url_scheme'], + req.environ.get("SERVER_NAME"), + req.environ.get("SERVER_PORT"), + req.environ['PATH_INFO']) class KeystoneAPI(wsgi.Router): @@ -552,9 +543,6 @@ class KeystoneAPI(wsgi.Router): # Miscellaneous Operations version_controller = VersionController(options) - mapper.connect("/v2.0/", controller=version_controller, - action="get_version_info", - conditions=dict(method=["GET"])) mapper.connect("/v2.0", controller=version_controller, action="get_version_info", conditions=dict(method=["GET"])) @@ -764,9 +752,6 @@ class KeystoneAdminAPI(wsgi.Router): # Miscellaneous Operations version_controller = VersionController(options) - mapper.connect("/v2.0/", controller=version_controller, - action="get_version_info", - conditions=dict(method=["GET"])) mapper.connect("/v2.0", controller=version_controller, action="get_version_info", conditions=dict(method=["GET"])) |