name argument makes no sense here

Pylons · Jun 13, 2011 · c209f80 · c209f80
1 parent d868fff
commit c209f80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pyramid/config.py b/pyramid/config.py
@@ -432,10 +432,10 @@ def notify(*events):
             _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
@@ -37,14 +37,13 @@ def registerSelfAdapter(self, required=None, provided=None, name=u'',
                                     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):