Merge upstream

1 files changed, 7 insertions, 3 deletions

diff --git a/astroid/protocols.py b/astroid/protocols.py
index b294a0b3..cb8426fb 100644
--- a/astroid/protocols.py
+++ b/astroid/protocols.py
@@ -280,12 +280,16 @@ def _arguments_infer_argname(self, name, context):
     # first argument of instance/class method
     if self.args and getattr(self.args[0], 'name', None) == name:
         functype = self.parent.type
+        cls = self.parent.parent.scope()
+        is_metaclass = isinstance(cls, nodes.ClassDef) and cls.type == 'metaclass'
+        # If this is a metaclass, then the first argument will always
+        # be the class, not an instance.
+        if is_metaclass or functype == 'classmethod':
+            yield cls
+            return
         if functype == 'method':
             yield bases.Instance(self.parent.parent.frame())
             return
-        if functype == 'classmethod':
-            yield self.parent.parent.frame()
-            return
 
     if context and context.callcontext:
         call_site = arguments.CallSite(context.callcontext)