garden

Chris McDonough

2011-09-11 04c2fc5f264b03fcaeff8613df2967453c04b1a3

garden

 pyramid/config/__init__.py

@@ -441,12 +441,9 @@
                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 @@
            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