Merge branch 'master' into 1.4-branch

Chris McDonough

2012-09-22 8c526eb6c1342a7506d83a3316e6386a3447a0b1

Merge branch 'master' into 1.4-branch

 TODO.txt

@@ -140,6 +140,10 @@
- 1.5: Maybe? deprecate set_request_property in favor of pointing people at
  add_request_method, schedule removal for 1.8?

- 1.5: Remove pyramid.config.rendering set_renderer_globals_factory maybe.

- 1.5: remove pyramid.config.route _add_view_from_route function.

- 1.6: Remove IContextURL and TraversalContextURL.

Probably Bad Ideas

 pyramid/config/routes.py

@@ -4,7 +4,6 @@
    IRequest,
    IRouteRequest,
    IRoutesMapper,
    PHASE1_CONFIG,
    PHASE2_CONFIG,
    )


 pyramid/mako_templating.py

@@ -91,7 +91,7 @@

    def __call__(self, info):
        p = re.compile(
                r'(?P<asset>[\w_.:/]+)'
                r'(?P<asset>[\w_.:/-]+)'
                r'(?:\#(?P<defname>[\w_]+))?'
                r'(\.(?P<ext>.*))'
                )

 pyramid/tests/test_mako_templating.py

@@ -31,6 +31,20 @@
        from pyramid.mako_templating import IMakoLookup
        return self.config.registry.getUtility(IMakoLookup, name=name)

    def test_hyphen_filenames(self):
        from pyramid.mako_templating import renderer_factory

        info = DummyRendererInfo({
            'name':'app:moon-and-world.mak',
            'package':None,
            'registry':self.config.registry,
            'settings':{},
            'type': ''
        })

        result = renderer_factory(info)
        self.assertEqual(result.path, 'app:moon-and-world.mak')

    def test_no_directories(self):
        info = DummyRendererInfo({
            'name':'pyramid.tests:fixtures/helloworld.mak',