diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-06-22 00:12:45 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-06-22 00:12:45 +0000 |
| commit | 6ecdbc409d2109a9e7fc5367c64067f0400f07cc (patch) | |
| tree | 37a01b7f6d9c9fe10f8201bf67d89dfd480e9072 /repoze/bfg/urldispatch.py | |
| parent | 352276d69311cbd2ec4985b4e809b607102c2dab (diff) | |
| download | pyramid-6ecdbc409d2109a9e7fc5367c64067f0400f07cc.tar.gz pyramid-6ecdbc409d2109a9e7fc5367c64067f0400f07cc.tar.bz2 pyramid-6ecdbc409d2109a9e7fc5367c64067f0400f07cc.zip | |
- Adding ``*path_info`` to a route no longer changes the PATH_INFO for
a request that matches using URL dispatch. This feature was only
there to service the ``repoze.bfg.wsgi.wsgiapp2`` decorator and it
did it wrong; use ``*subpath`` instead now.
- The interface generation performed for named request factories had the
wrong base classes.
Diffstat (limited to 'repoze/bfg/urldispatch.py')
| -rw-r--r-- | repoze/bfg/urldispatch.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py index 591a91c57..6d12cae39 100644 --- a/repoze/bfg/urldispatch.py +++ b/repoze/bfg/urldispatch.py @@ -48,21 +48,6 @@ class RoutesRootFactory(Mapper): environ['bfg.routes.matchdict'] = args adhoc_attrs = environ.setdefault('webob.adhoc_attrs', {}) adhoc_attrs['matchdict'] = args - # this is stolen from routes.middleware; if the route map - # has a *path_info capture, use it to influence the path - # info and script_name of the generated environment - if 'path_info' in args: - if not 'SCRIPT_NAME' in environ: - environ['SCRIPT_NAME'] = '' - oldpath = environ['PATH_INFO'] - newpath = args['path_info'] or '' - environ['PATH_INFO'] = newpath - if not environ['PATH_INFO'].startswith('/'): - environ['PATH_INFO'] = '/' + environ['PATH_INFO'] - pattern = r'^(.*?)/' + re.escape(newpath) + '$' - environ['SCRIPT_NAME'] += re.sub(pattern, r'\1', oldpath) - if environ['SCRIPT_NAME'].endswith('/'): - environ['SCRIPT_NAME'] = environ['SCRIPT_NAME'][:-1] factory = route._factory or self.default_root_factory return factory(environ) |
