Fixing identical code blocks

akshat62 · web-flow · commit 0502f3e6599f · 2025-05-09T01:13:13.000+05:30
diff --git a/Lib/annotationlib.py b/Lib/annotationlib.py
@@ -372,26 +372,17 @@ def __convert_to_ast(self, other):
             extra_names = {}
             elts = []
 
-            # For sets, we need to ensure consistent ordering
-            if type(other) is set:
-                # For sets of types, sort by __name__
-                if all(isinstance(x, type) for x in other):
-                    # Sort the elements by name
-                    sorted_elts = sorted(other, key=lambda x: x.__name__)
-                    for elt in sorted_elts:
-                        new_elt, new_extra_names = self.__convert_to_ast(elt)
-                        if new_extra_names is not None:
-                            extra_names.update(new_extra_names)
-                        elts.append(new_elt)
-                else:
-                    # For other sets, just use the original order
-                    for elt in other:
-                        new_elt, new_extra_names = self.__convert_to_ast(elt)
-                        if new_extra_names is not None:
-                            extra_names.update(new_extra_names)
-                        elts.append(new_elt)
+            # For sets of types, sort elements by name for consistent ordering.
+            if type(other) is set and all(isinstance(x, type) for x in other):
+                # Sort the elements by name to ensure deterministic output.
+                sorted_elts = sorted(other, key=lambda x: x.__name__)
+                for elt in sorted_elts:
+                    new_elt, new_extra_names = self.__convert_to_ast(elt)
+                    if new_extra_names is not None:
+                        extra_names.update(new_extra_names)
+                    elts.append(new_elt)
             else:
-                # For lists and tuples, preserve the original order
+                # For lists, tuples, and other sets, preserve the original order.
                 for elt in other:
                     new_elt, new_extra_names = self.__convert_to_ast(elt)
                     if new_extra_names is not None:
@@ -840,7 +831,7 @@ def _stringify_single(anno):
     elif isinstance(anno, _Template):
         return ast.unparse(_template_to_ast(anno))
     elif isinstance(anno, set) and all(isinstance(x, type) for x in anno):
-        # Sort set elements by name to ensure consistent ordering
+        # Sort set elements by name to ensure consistent ordering.
         sorted_elements = sorted(anno, key=lambda x: x.__name__)
         return "{" + ", ".join(x.__name__ for x in sorted_elements) + "}"
     else:
@@ -1053,7 +1044,7 @@ def annotations_to_string(annotations):
         if isinstance(t, str):
             result[n] = t
         elif isinstance(t, set) and all(isinstance(x, type) for x in t):
-            # Sort set elements by name to ensure consistent ordering
+            # Sort set elements by name to ensure consistent ordering.
             sorted_elements = sorted(t, key=lambda x: x.__name__)
             result[n] = "{" + ", ".join(x.__name__ for x in sorted_elements) + "}"
         else:
