Added py3 support

2 files changed, 6 insertions, 2 deletions

diff --git a/pyramid/tests/test_config/test_factories.py b/pyramid/tests/test_config/test_factories.py
index 5ae486c4b..e93ba6908 100644
--- a/pyramid/tests/test_config/test_factories.py
+++ b/pyramid/tests/test_config/test_factories.py
@@ -120,13 +120,17 @@ class TestFactoriesMixin(unittest.TestCase):
         def boomshaka(r): pass
         name = text_(b'La Pe\xc3\xb1a', 'utf-8')
         config.add_request_method(boomshaka, name=name)
+
+        name2 = b'La Pe\xc3\xb1a'
+        config.add_request_method(boomshaka, name=name2)
+
         exts = config.registry.getUtility(IRequestExtensions)
         inst = InstancePropertyMixin()
 
         def set_extensions():
             inst._set_extensions(exts)
+
         self.assertRaises(ValueError, set_extensions)
-        self.assertTrue(name in exts.methods)
 
 class TestDeprecatedFactoriesMixinMethods(unittest.TestCase):
     def setUp(self):
diff --git a/pyramid/util.py b/pyramid/util.py
index e9f5760a6..6ab621fd4 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -113,7 +113,7 @@ class InstancePropertyMixin(object):
             method = fn.__get__(self, self.__class__)
             try:
                 setattr(self, name, method)
-            except UnicodeEncodeError:
+            except (UnicodeEncodeError, TypeError):
                 msg = (
                     '`name="%s"` is invalid. `name` must be ascii because it is '
                     'used on __name__ of the method'