fix tests on py2

5 files changed, 15 insertions, 16 deletions

diff --git a/pyramid/compat.py b/pyramid/compat.py
index 5ef3c4e6d..21e8df6a5 100644
--- a/pyramid/compat.py
+++ b/pyramid/compat.py
@@ -32,6 +32,7 @@ else:
     class_types = (type, types.ClassType)
     text_type = unicode
     binary_type = str
+    long = long
     def ords_(s):
         return [ord(x) for x in s]
 
diff --git a/pyramid/config/views.py b/pyramid/config/views.py
index f1370a4b9..203f2b5c6 100644
--- a/pyramid/config/views.py
+++ b/pyramid/config/views.py
@@ -43,6 +43,7 @@ from pyramid.config.util import as_sorted_tuple
 from pyramid.config.util import make_predicates
 
 urljoin = urlparse.urljoin
+url_parse = urlparse.urlparse
 
 def wraps_view(wrapper):
     def inner(self, view):
@@ -1447,7 +1448,7 @@ class StaticURLInfo(object):
             # make sure it ends with a slash
             name = name + '/'
 
-        if urlparse(name)[0]:
+        if url_parse(name)[0]:
             # it's a URL
             # url, spec, route_name
             url = name
diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py
index d48cba58d..572f14f0b 100644
--- a/pyramid/tests/test_request.py
+++ b/pyramid/tests/test_request.py
@@ -52,7 +52,7 @@ class TestRequest(unittest.TestCase):
             }
         request = self._makeOne(environ)
         request.charset = None
-        self.assertEqual(request.GET['la'], text_('La Pe\xf1a', 'utf-8'))
+        self.assertEqual(request.GET['la'], text_('La Pe\xf1a'))
 
     def test_class_implements(self):
         from pyramid.interfaces import IRequest
diff --git a/pyramid/tests/test_traversal.py b/pyramid/tests/test_traversal.py
index 2f3a0017a..6231c516b 100644
--- a/pyramid/tests/test_traversal.py
+++ b/pyramid/tests/test_traversal.py
@@ -58,7 +58,7 @@ class TraversalPathTests(unittest.TestCase):
     def test_unicode_highorder_chars(self):
         path = text_('/%E6%B5%81%E8%A1%8C%E8%B6%8B%E5%8A%BF')
         self.assertEqual(self._callFUT(path),
-                         (text_('\u6d41\u884c\u8d8b\u52bf'),))
+                         (text_('\u6d41\u884c\u8d8b\u52bf', 'unicode_escape'),))
 
     def test_unicode_simple(self):
         path = text_('/abc')
diff --git a/pyramid/tests/test_urldispatch.py b/pyramid/tests/test_urldispatch.py
index 6cad71d90..8a4252766 100644
--- a/pyramid/tests/test_urldispatch.py
+++ b/pyramid/tests/test_urldispatch.py
@@ -365,10 +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', 'utf-8')})
+        self.matches('{x}', '/La%20Pe%C3%B1a', {'x':text_('La Pe\xf1a')})
         self.matches('*traverse', '/La%20Pe%C3%B1a/x',
-                     {'traverse':(text_('La Pe\xf1a', 'utf-8'), 'x')})
+                     {'traverse':(text_('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')})
@@ -390,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', 'utf-8')})
+                     {'x':text_('La Pe\xf1a')})
         self.matches('*traverse', '/La%20Pe%C3%B1a/x',
-                     {'traverse':(text_('La Pe\xf1a', 'utf-8'), 'x')})
+                     {'traverse':(text_('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'})
@@ -411,13 +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':unicode('/La Pe\xc3\xb1a', 'utf-8')},
+        self.generates('/{x}', {'x':text_('/La Pe\xc3\xb1a', 'utf-8')},
                        '/%2FLa%20Pe%C3%B1a')
-        self.generates('/{x}*y', {'x':unicode('/La Pe\xc3\xb1a', 'utf-8'),
+        self.generates('/{x}*y', {'x':text_('/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', 'utf-8'))},
+        self.generates('*traverse', {'traverse':('a', text_('La Pe\xf1a'))},
                        '/a/La%20Pe%C3%B1a')
         self.generates('/foo/{id}.html', {'id':'bar'}, '/foo/bar.html')
         self.generates('/foo/{_}', {'_':'20'}, '/foo/20')
@@ -432,13 +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':unicode('/La Pe\xc3\xb1a', 'utf-8')},
+        self.generates('/:x', {'x':text_('/La Pe\xc3\xb1a', 'utf-8')},
                        '/%2FLa%20Pe%C3%B1a')
-        self.generates('/:x*y', {'x':unicode('/La Pe\xc3\xb1a', 'utf-8'),
+        self.generates('/:x*y', {'x':text_('/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', 'utf-8'))},
+        self.generates('*traverse', {'traverse':('a', text_('La Pe\xf1a'))},
                        '/a/La%20Pe%C3%B1a')
         self.generates('/foo/:id.html', {'id':'bar'}, '/foo/bar.html')
         self.generates('/foo/:_', {'_':'20'}, '/foo/20')