diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-24 00:57:12 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-24 00:57:12 -0400 |
| commit | 2e409a88b60be27f8868c95f0fff806fb6cdc155 (patch) | |
| tree | b638d8e135bd9aec9cf599ace972a7529c4a04f2 | |
| parent | 6df90b7035cb06412a451881e6f4e31438fc570b (diff) | |
| download | pyramid-2e409a88b60be27f8868c95f0fff806fb6cdc155.tar.gz pyramid-2e409a88b60be27f8868c95f0fff806fb6cdc155.tar.bz2 pyramid-2e409a88b60be27f8868c95f0fff806fb6cdc155.zip | |
fail right
| -rw-r--r-- | pyramid/tests/test_urldispatch.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pyramid/tests/test_urldispatch.py b/pyramid/tests/test_urldispatch.py index 8a4252766..2f6182a66 100644 --- a/pyramid/tests/test_urldispatch.py +++ b/pyramid/tests/test_urldispatch.py @@ -365,9 +365,9 @@ class TestCompileRouteFunctional(unittest.TestCase): {'x':'abc', 'traverse':('def', 'g')}) self.matches('*traverse', '/zzz/abc', {'traverse':('zzz', 'abc')}) self.matches('*traverse', '/zzz/%20abc', {'traverse':('zzz', ' abc')}) - self.matches('{x}', '/La%20Pe%C3%B1a', {'x':text_('La Pe\xf1a')}) + self.matches('{x}', '/La%20Pe%C3%B1a', {'x':text_(b'La Pe\xf1a')}) self.matches('*traverse', '/La%20Pe%C3%B1a/x', - {'traverse':(text_('La Pe\xf1a'), 'x')}) + {'traverse':(text_(b'La Pe\xf1a'), 'x')}) self.matches('/foo/{id}.html', '/foo/bar.html', {'id':'bar'}) self.matches('/{num:[0-9]+}/*traverse', '/555/abc/def', {'num':'555', 'traverse':('abc', 'def')}) @@ -389,9 +389,9 @@ class TestCompileRouteFunctional(unittest.TestCase): self.matches('*traverse', '/zzz/abc', {'traverse':('zzz', 'abc')}) self.matches('*traverse', '/zzz/%20abc', {'traverse':('zzz', ' abc')}) self.matches(':x', '/La%20Pe%C3%B1a', - {'x':text_('La Pe\xf1a')}) + {'x':text_(b'La Pe\xf1a')}) self.matches('*traverse', '/La%20Pe%C3%B1a/x', - {'traverse':(text_('La Pe\xf1a'), 'x')}) + {'traverse':(text_(b'La Pe\xf1a'), 'x')}) self.matches('/foo/:id.html', '/foo/bar.html', {'id':'bar'}) self.matches('/foo/:id_html', '/foo/bar_html', {'id_html':'bar_html'}) self.matches('zzz/:_', '/zzz/abc', {'_':'abc'}) @@ -410,12 +410,12 @@ class TestCompileRouteFunctional(unittest.TestCase): '/zzz/abc') self.generates('zzz/{x}*traverse', {'x':'abc', 'traverse':'/def/g'}, '/zzz/abc/def/g') - self.generates('/{x}', {'x':text_('/La Pe\xc3\xb1a', 'utf-8')}, + self.generates('/{x}', {'x':text_(b'/La Pe\xc3\xb1a', 'utf-8')}, '/%2FLa%20Pe%C3%B1a') - self.generates('/{x}*y', {'x':text_('/La Pe\xc3\xb1a', 'utf-8'), + self.generates('/{x}*y', {'x':text_(b'/La Pe\xc3\xb1a', 'utf-8'), 'y':'/rest/of/path'}, '/%2FLa%20Pe%C3%B1a/rest/of/path') - self.generates('*traverse', {'traverse':('a', text_('La Pe\xf1a'))}, + self.generates('*traverse', {'traverse':('a', text_(b'La Pe\xf1a'))}, '/a/La%20Pe%C3%B1a') self.generates('/foo/{id}.html', {'id':'bar'}, '/foo/bar.html') self.generates('/foo/{_}', {'_':'20'}, '/foo/20') @@ -430,12 +430,12 @@ class TestCompileRouteFunctional(unittest.TestCase): '/zzz/abc') self.generates('zzz/:x*traverse', {'x':'abc', 'traverse':'/def/g'}, '/zzz/abc/def/g') - self.generates('/:x', {'x':text_('/La Pe\xc3\xb1a', 'utf-8')}, + self.generates('/:x', {'x':text_(b'/La Pe\xc3\xb1a', 'utf-8')}, '/%2FLa%20Pe%C3%B1a') - self.generates('/:x*y', {'x':text_('/La Pe\xc3\xb1a', 'utf-8'), + self.generates('/:x*y', {'x':text_(b'/La Pe\xc3\xb1a', 'utf-8'), 'y':'/rest/of/path'}, '/%2FLa%20Pe%C3%B1a/rest/of/path') - self.generates('*traverse', {'traverse':('a', text_('La Pe\xf1a'))}, + self.generates('*traverse', {'traverse':('a', text_(b'La Pe\xf1a'))}, '/a/La%20Pe%C3%B1a') self.generates('/foo/:id.html', {'id':'bar'}, '/foo/bar.html') self.generates('/foo/:_', {'_':'20'}, '/foo/20') |