fix test failures on python 3

Chris McDonough

2012-01-05 403dc9f1ca3627c9456a056b7a5f6429c0c218e5

fix test failures on python 3

 pyramid/tests/test_config/test_util.py

@@ -230,7 +230,7 @@

    def test_traverse_matches_with_highorder_chars(self):
        order, predicates, phash = self._callFUT(
            traverse=text_('/La Pe\xc3\xb1a/{x}', 'utf-8'))
            traverse=text_(b'/La Pe\xc3\xb1a/{x}', 'utf-8'))
        self.assertEqual(len(predicates), 1)
        pred = predicates[0]
        info = {'match':{'x':text_(b'Qu\xc3\xa9bec', 'utf-8')}}

 pyramid/tests/test_traversal.py

@@ -139,7 +139,7 @@
        root = DummyContext(foo, 'root')
        policy = self._makeOne(root)
        if PY3:
            path_info = b'/Qu\xc3\xa9bec'.encode('latin-1')
            path_info = b'/Qu\xc3\xa9bec'.decode('latin-1')
        else:
            path_info = b'/Qu\xc3\xa9bec'
        environ = self._getEnviron(PATH_INFO=path_info)
@@ -326,7 +326,7 @@
        root = DummyContext(foo, 'root')
        policy = self._makeOne(root)
        if PY3:
            vhm_root = b'/Qu\xc3\xa9bec'.encode('latin-1')
            vhm_root = b'/Qu\xc3\xa9bec'.decode('latin-1')
        else:
            vhm_root = b'/Qu\xc3\xa9bec'
        environ = self._getEnviron(HTTP_X_VHM_ROOT=vhm_root,
@@ -338,7 +338,7 @@
        self.assertEqual(result['subpath'], ())
        self.assertEqual(
            result['traversed'],
            (text_(b'Qu\xc3\xa9bec', 'utf-8'), u'bar')
            (text_(b'Qu\xc3\xa9bec', 'utf-8'), text_('bar'))
            )
        self.assertEqual(result['root'], policy.root)
        self.assertEqual(result['virtual_root'], foo)