summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2008-09-17 18:46:04 +0000
committerChris McDonough <chrism@agendaless.com>2008-09-17 18:46:04 +0000
commit3add1b9a5f5210f966db354026a09fe2a263c660 (patch)
tree2ece015e375c33718f67e6227d4fd08ae5f25fdb
parent757772c7f2f8d1759a1655ba45f5647783170923 (diff)
downloadpyramid-3add1b9a5f5210f966db354026a09fe2a263c660.tar.gz
pyramid-3add1b9a5f5210f966db354026a09fe2a263c660.tar.bz2
pyramid-3add1b9a5f5210f966db354026a09fe2a263c660.zip
- Routes URL dispatch did not have access to the WSGI environment,
so conditions such as method=GET did not work.
-rw-r--r--CHANGES.txt7
-rw-r--r--repoze/bfg/tests/test_urldispatch.py1
-rw-r--r--repoze/bfg/urldispatch.py1
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 4825852c1..a1ac46fd6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,12 @@ Next release
Docs
- Documented URL dispatch better in narrative form.
+ - Documented URL dispatch better in narrative form.
+
+ Bug fixes
+
+ - Routes URL dispatch did not have access to the WSGI environment,
+ so conditions such as method=GET did not work.
0.3.7 (09/09/2008)
diff --git a/repoze/bfg/tests/test_urldispatch.py b/repoze/bfg/tests/test_urldispatch.py
index 84c7b5c09..806af28df 100644
--- a/repoze/bfg/tests/test_urldispatch.py
+++ b/repoze/bfg/tests/test_urldispatch.py
@@ -22,6 +22,7 @@ class RoutesMapperTests(unittest.TestCase):
environ = self._getEnviron(PATH_INFO='/')
result = mapper(environ)
self.assertEqual(result, marker)
+ self.assertEqual(mapper.mapper.environ, environ)
def test_routes_mapper_route_matches(self):
marker = ()
diff --git a/repoze/bfg/urldispatch.py b/repoze/bfg/urldispatch.py
index 0be937ab0..46812390a 100644
--- a/repoze/bfg/urldispatch.py
+++ b/repoze/bfg/urldispatch.py
@@ -41,6 +41,7 @@ class RoutesMapper(object):
self.mapper.create_regs([])
self._regs_created = True
path = environ.get('PATH_INFO', '/')
+ self.mapper.environ = environ
args = self.mapper.match(path)
if args:
context_factory = args.get('context_factory', _marker)