diff options
| -rw-r--r-- | docs/conf.py | 5 | ||||
| -rw-r--r-- | pyramid/tests/test_encode.py | 4 | ||||
| -rw-r--r-- | pyramid/tests/test_router.py | 8 |
3 files changed, 7 insertions, 10 deletions
diff --git a/docs/conf.py b/docs/conf.py index f32c3560a..a5eaeb0fb 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -133,11 +133,6 @@ add_module_names = False if book: pygments_style = 'bw' -# do not include book material for online docs -if not book: - exclude_patterns.extend(['foreword.rst', 'latexindex.rst', - 'authorintro.rst']) - # The default language to highlight source code in. #highlight_language = 'guess' diff --git a/pyramid/tests/test_encode.py b/pyramid/tests/test_encode.py index 741a24393..27965aea9 100644 --- a/pyramid/tests/test_encode.py +++ b/pyramid/tests/test_encode.py @@ -29,6 +29,10 @@ class UrlEncodeTests(unittest.TestCase): result = self._callFUT([('a', s)], doseq=True) self.assertEqual(result, 'a=1&a=2') + def test_with_spaces(self): + result = self._callFUT([('a', '123 456')], doseq=True) + self.assertEqual(result, 'a=123+456') + def test_dict(self): result = self._callFUT({'a':1}) self.assertEqual(result, 'a=1') diff --git a/pyramid/tests/test_router.py b/pyramid/tests/test_router.py index 35f2e4352..a98018500 100644 --- a/pyramid/tests/test_router.py +++ b/pyramid/tests/test_router.py @@ -269,15 +269,14 @@ class TestRouter(unittest.TestCase): start_response = DummyStartResponse() why = exc_raised(HTTPNotFound, router, environ, start_response) self.assertTrue( - "debug_notfound of url http://localhost:8080/; path_info: '/', " - "context:" in why[0]) + "debug_notfound of url http://localhost:8080/; " in why[0]) self.assertTrue("view_name: '', subpath: []" in why[0]) self.assertTrue('http://localhost:8080' in why[0], why) self.assertEqual(len(logger.messages), 1) message = logger.messages[0] self.assertTrue('of url http://localhost:8080' in message) - self.assertTrue("path_info: '/'" in message) + self.assertTrue("path_info: " in message) self.assertTrue('DummyContext instance at' in message) self.assertTrue("view_name: ''" in message) self.assertTrue("subpath: []" in message) @@ -658,8 +657,7 @@ class TestRouter(unittest.TestCase): "route matched for url http://localhost:8080" "/archives/action1/article1; " "route_name: 'foo', " - "path_info: '/archives/action1/article1', " - "pattern: 'archives/:action/:article', ")) + "path_info: ")) def test_call_route_match_miss_debug_routematch(self): from pyramid.httpexceptions import HTTPNotFound |