diff options
author | ianb <devnull@localhost> | 2007-04-15 17:33:05 +0000 |
---|---|---|
committer | ianb <devnull@localhost> | 2007-04-15 17:33:05 +0000 |
commit | 14646c9de1eea8ff96d02a66437bf2a75df35ea7 (patch) | |
tree | 22afa94b96e622619ade2a656cd635351bee3885 /paste/wsgiwrappers.py | |
parent | 7ece1ccb1f175a8d2a6d0953bb93fa2215b2ae75 (diff) | |
download | paste-14646c9de1eea8ff96d02a66437bf2a75df35ea7.tar.gz |
Fix .urlvars to use wsgiorg.routing_args
Diffstat (limited to 'paste/wsgiwrappers.py')
-rw-r--r-- | paste/wsgiwrappers.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/paste/wsgiwrappers.py b/paste/wsgiwrappers.py index 99c1fd5..e9d24e8 100644 --- a/paste/wsgiwrappers.py +++ b/paste/wsgiwrappers.py @@ -124,7 +124,19 @@ class WSGIRequest(object): method = environ_getter('REQUEST_METHOD') script_name = environ_getter('SCRIPT_NAME') path_info = environ_getter('PATH_INFO') - urlvars = environ_getter('paste.urlvars', default_factory=dict) + + def urlvars(self): + """ + Return any variables matched in the URL (e.g., + ``wsgiorg.routing_args``). + """ + if 'paste.urlvars' in self.environ: + return self.environ['paste.urlvars'] + elif 'wsgiorg.routing_args' in self.environ: + return self.environ['wsgiorg.routing_args'][1] + else: + return {} + urlvars = property(urlvars, doc=urlvars.__doc__) def is_xhr(self): """Returns a boolean if X-Requested-With is present and a XMLHttpRequest""" |