name argument makes no sense here

2 files changed, 4 insertions, 5 deletions

diff --git a/pyramid/config.py b/pyramid/config.py
index fab75f56d..dbeb0788c 100644
--- a/pyramid/config.py
+++ b/pyramid/config.py
@@ -432,10 +432,10 @@ class Configurator(object):
             _registry.has_listeners = True
 
         if not hasattr(_registry, 'queryAdapterOrSelf'):
-            def queryAdapterOrSelf(object, interface, name=u'', default=None):
+            def queryAdapterOrSelf(object, interface, default=None):
                 provides = providedBy(object)
                 if not interface in provides:
-                    return _registry.queryAdapter(object, interface, name=name,
+                    return _registry.queryAdapter(object, interface,
                                                   default=default)
                 return object
             _registry.queryAdapterOrSelf = queryAdapterOrSelf
diff --git a/pyramid/registry.py b/pyramid/registry.py
index 26f84d493..4c6262ce1 100644
--- a/pyramid/registry.py
+++ b/pyramid/registry.py
@@ -37,14 +37,13 @@ class Registry(Components, dict):
                                     provided=provided, name=name,
                                     info=info, event=event)
 
-    def queryAdapterOrSelf(self, object, interface, name=u'', default=None):
+    def queryAdapterOrSelf(self, object, interface, default=None):
         # queryAdapter analogue which returns the object if it implements
         # the interface, otherwise it will return an adaptation to the
         # interface
         provides = providedBy(object)
         if not interface in provides:
-            return self.queryAdapter(object, interface, name=name,
-                                     default=default)
+            return self.queryAdapter(object, interface, default=default)
         return object
 
     def registerHandler(self, *arg, **kw):