diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-01 15:56:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-01 15:56:49 +0000 |
| commit | 3cb2c95b162f4fb0b3b61564c8962ac592a37524 (patch) | |
| tree | 763888df27e4b36e3edca1d330e7db3962342e5e | |
| parent | f1ac78c8992432e5f6d5c29f24f202870cb14a97 (diff) | |
| parent | a2f0a012ded013f48f5c8efce52e66478c9e313d (diff) | |
| download | keystone-3cb2c95b162f4fb0b3b61564c8962ac592a37524.tar.gz keystone-3cb2c95b162f4fb0b3b61564c8962ac592a37524.tar.xz keystone-3cb2c95b162f4fb0b3b61564c8962ac592a37524.zip | |
Merge "Use keystone.wsgi.Request for RequestClass"
| -rw-r--r-- | keystone/common/wsgi.py | 2 | ||||
| -rw-r--r-- | tests/test_wsgi.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/keystone/common/wsgi.py b/keystone/common/wsgi.py index 381f1ff0..87636dbe 100644 --- a/keystone/common/wsgi.py +++ b/keystone/common/wsgi.py @@ -203,7 +203,7 @@ class BaseApplication(object): class Application(BaseApplication): - @webob.dec.wsgify + @webob.dec.wsgify(RequestClass=Request) def __call__(self, req): arg_dict = req.environ['wsgiorg.routing_args'][1] action = arg_dict.pop('action') diff --git a/tests/test_wsgi.py b/tests/test_wsgi.py index 369dd952..003f7571 100644 --- a/tests/test_wsgi.py +++ b/tests/test_wsgi.py @@ -14,8 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -import webob - from keystone import test from keystone.common import wsgi @@ -34,7 +32,7 @@ class BaseWSGITest(test.TestCase): super(BaseWSGITest, self).setUp() def _make_request(self, url='/'): - req = webob.Request.blank(url) + req = wsgi.Request.blank(url) args = {'action': 'index', 'controller': None} req.environ['wsgiorg.routing_args'] = [None, args] return req |