diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-10 18:00:54 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-10 18:00:54 -0400 |
| commit | 04c2fc5f264b03fcaeff8613df2967453c04b1a3 (patch) | |
| tree | c54315137ee258f1bc0b2c5f7b726eecfe87c14c | |
| parent | f3b6a3653de8d6c33473d113ab8238eb40695632 (diff) | |
| download | pyramid-04c2fc5f264b03fcaeff8613df2967453c04b1a3.tar.gz pyramid-04c2fc5f264b03fcaeff8613df2967453c04b1a3.tar.bz2 pyramid-04c2fc5f264b03fcaeff8613df2967453c04b1a3.zip | |
garden
| -rw-r--r-- | pyramid/config/__init__.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/pyramid/config/__init__.py b/pyramid/config/__init__.py index 9899f2117..a2014b1b5 100644 --- a/pyramid/config/__init__.py +++ b/pyramid/config/__init__.py @@ -441,12 +441,9 @@ class Configurator( callable(*args, **kw) else: - info = self.info + info = self.info # usually a ZCML action if self.info has data if not info: - # Try to provide more accurate info for conflict reports by - # wrapping the context in a decorator and attaching caller info - # to it, unless the context already has info (if it already has - # info, it's likely a context generated by a ZCML directive). + # Try to provide more accurate info for conflict reports if self._ainfo: info = self._ainfo[0] else: @@ -595,7 +592,7 @@ class Configurator( old_route_prefix.rstrip('/'), route_prefix.lstrip('/') ) - route_prefix = route_prefix.lstrip('/').rstrip('/') + route_prefix = route_prefix.strip('/') if not route_prefix: route_prefix = None |