Merge pull request #1456 from cdevienne/1.5-branch

Tres Seaver

2014-11-13 c12738d8951fafe9921184a0624310e8423aaceb

Merge pull request #1456 from cdevienne/1.5-branch

Remove duplicate code

 pyramid/config/views.py

@@ -1189,10 +1189,6 @@
        predlist = self.get_predlist('view')

        def register(permission=permission, renderer=renderer):
            # the discrim_func above is guaranteed to have been called already
            order = view_intr['order']
            preds = view_intr['predicates']
            phash = view_intr['phash']
            request_iface = IRequest
            if route_name is not None:
                request_iface = self.registry.queryUtility(IRouteRequest,