Move MemberExpr to end after test fail

AFanaei · AFanaei · commit f8df8c98d0d0 · 2019-10-12T10:26:25.000+03:30
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -2120,19 +2120,17 @@ def analyze_namedtuple_assign(self, s: AssignmentStmt) -> bool:
         """Check if s defines a namedtuple."""
         if isinstance(s.rvalue, CallExpr) and isinstance(s.rvalue.analyzed, NamedTupleExpr):
             return True  # This is a valid and analyzed named tuple definition, nothing to do here.
-        if len(s.lvalues) != 1:
-            return False
-        if not isinstance(s.lvalues[0], NameExpr):
-            if isinstance(s.lvalues[0], MemberExpr):
-                self.fail("NamedTuple type as an attribute is not supported", s.lvalues[0])
-                return False
+        if len(s.lvalues) != 1 or not isinstance(s.lvalues[0], (NameExpr, MemberExpr)):
             return False
         lvalue = s.lvalues[0]
         name = lvalue.name
         is_named_tuple, info = self.named_tuple_analyzer.check_namedtuple(s.rvalue, name,
                                                                           self.is_func_scope())
         if not is_named_tuple:
             return False
+        if isinstance(s.lvalues[0], MemberExpr):
+            self.fail("NamedTuple type as an attribute is not supported", s.lvalues[0])
+            return False
         # Yes, it's a valid namedtuple, but defer if it is not ready.
         if not info:
             self.mark_incomplete(name, lvalue, becomes_typeinfo=True)
