Corrected child order

52e6765 introduced a new type of
child iteration.
Some classes started yielding children in the incorrect order,
which was causing test failures in pylint.
This change corrects the ordering to match the _astroid_fields
of the class.

Relates to a change from #497

Author: AWhetter

astroid/node_classes.py

@@ -1539,12 +1539,6 @@ def get_children(self):
         yield from self.defaults
         yield from self.kwonlyargs
 
-        if self.varargannotation is not None:
-            yield self.varargannotation
-
-        if self.kwargannotation is not None:
-            yield self.kwargannotation
-
         for elt in self.kw_defaults:
             if elt is not None:
                 yield elt
@@ -1553,6 +1547,12 @@ def get_children(self):
             if elt is not None:
                 yield elt
 
+        if self.varargannotation is not None:
+            yield self.varargannotation
+
+        if self.kwargannotation is not None:
+            yield self.kwargannotation
+
         for elt in self.kwonlyargs_annotations:
             if elt is not None:
                 yield elt
@@ -3770,12 +3770,12 @@ def get_children(self):
         if self.lower is not None:
             yield self.lower
 
-        if self.step is not None:
-            yield self.step
-
         if self.upper is not None:
             yield self.upper
 
+        if self.step is not None:
+            yield self.step
+
 
 class Starred(mixins.ParentAssignTypeMixin, NodeNG):
     """Class representing an :class:`ast.Starred` node.

astroid/scoped_nodes.py

@@ -2694,14 +2694,14 @@ def bool_value(self):
         return True
 
     def get_children(self):
-        for elt in self.body:
-            yield elt
+        if self.decorators is not None:
+            yield self.decorators
 
         for elt in self.bases:
             yield elt
 
-        if self.decorators is not None:
-            yield self.decorators
+        for elt in self.body:
+            yield elt
 
     def _get_assign_nodes(self):
         for child_node in self.body: