diff options
| author | Ziad Sawalha <ziad.sawalha@rackspace.com> | 2011-07-08 14:06:49 -0700 |
|---|---|---|
| committer | Ziad Sawalha <ziad.sawalha@rackspace.com> | 2011-07-08 14:06:49 -0700 |
| commit | ebe8e255ac42c07da7bfc44fd19c1f052d3f8853 (patch) | |
| tree | 6523f26ec7c2a41de525d97ff3ae3f97e12dbde3 /keystone/server.py | |
| parent | 9528697d2fcfbe9b7ba1d445280d10dc4c8e1e8d (diff) | |
| parent | 418a9e5913fe25fb4c5e704655d2497da3bc5d41 (diff) | |
| download | keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.tar.gz keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.tar.xz keystone-ebe8e255ac42c07da7bfc44fd19c1f052d3f8853.zip | |
Merge pull request #82 from dolph/master
Global fixes for issues #33 and #65
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"])) |