rename CommonConstants to CommonConstant

Author: MatthieuDartiailh

src/bytecode/concrete.py

@@ -42,7 +42,7 @@
     BaseInstr,
     BinaryOp,
     CellVar,
-    CommonConstants,
+    CommonConstant,
     Compare,
     FormatValue,
     FreeVar,
@@ -1096,7 +1096,7 @@ def to_bytecode(
                 elif opcode in BINARY_OPS:
                     arg = BinaryOp(c_arg)
                 elif opcode in COMMON_CONSTANT_OPS:
-                    arg = CommonConstants(c_arg)
+                    arg = CommonConstant(c_arg)
                 elif opcode in SPECIAL_OPS:
                     arg = SpecialMethod(c_arg)
                 elif opcode in FORMAT_VALUE_OPS:

src/bytecode/instr.py

@@ -209,7 +209,7 @@ class SpecialMethod(enum.IntEnum):
 
 
 @enum.unique
-class CommonConstants(enum.IntEnum):
+class CommonConstant(enum.IntEnum):
     """Common constants names used with LOAD_COMMON_CONSTANT"""
 
     ASSERTION_ERROR = 0
@@ -872,7 +872,7 @@ def _cmp_key(self) -> Tuple[Optional[InstrLocation], str, Any]:
     BinaryOp,
     Intrinsic1Op,
     Intrinsic2Op,
-    CommonConstants,
+    CommonConstant,
     SpecialMethod,
     Tuple[bool, str],
     Tuple[bool, bool, str],
@@ -1034,10 +1034,10 @@ def _check_arg(self, name: str, opcode: int, arg: InstrArg) -> None:
                     "SpecialMethod, got %s" % (name, type(arg).__name__)
                 )
         elif opcode in COMMON_CONSTANT_OPS:
-            if not isinstance(arg, CommonConstants):
+            if not isinstance(arg, CommonConstant):
                 raise TypeError(
                     "operation %s argument type must be "
-                    "CommonConstants, got %s" % (name, type(arg).__name__)
+                    "CommonConstant, got %s" % (name, type(arg).__name__)
                 )
 
         elif opcode in FORMAT_VALUE_OPS:

tests/test_instr.py

@@ -25,7 +25,7 @@
     INTRINSIC_2OP,
     SMALL_INT_OPS,
     SPECIAL_OPS,
-    CommonConstants,
+    CommonConstant,
     FormatValue,
     InstrLocation,
     Intrinsic1Op,
@@ -181,7 +181,7 @@ def test_invalid_arg(self):
             assert name == "LOAD_COMMON_CONSTANT", (
                 f"expected LOAD_COMMON_CONSTANT but got {name=}"
             )
-            Instr("LOAD_COMMON_CONSTANT", CommonConstants.BUILTIN_ALL)
+            Instr("LOAD_COMMON_CONSTANT", CommonConstant.BUILTIN_ALL)
             self.assertRaises(
                 TypeError,
                 Instr,