]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-43945: [Enum] Deprecate non-standard mixin format() behavior (GH-25649)
authorEthan Furman <ethan@stoneleaf.us>
Tue, 27 Apr 2021 05:42:57 +0000 (22:42 -0700)
committerGitHub <noreply@github.com>
Tue, 27 Apr 2021 05:42:57 +0000 (22:42 -0700)
In 3.12 the enum member, not the member's value, will be used for
format() calls.  Format specifiers can be used to retain the current
display of enum members:

Example enumeration:

    class Color(IntEnum):
        RED = 1
        GREEN = 2
        BLUE = 3

Current behavior:

    f'{Color.RED}'  -->  '1'

Future behavior:

    f'{Color.RED}'  --> 'RED'

Using d specifier:

    f'{Color.RED:d}'  --> '1'

Using specifiers can be done now and is future-compatible.

Lib/enum.py
Lib/test/test_enum.py
Misc/NEWS.d/next/Library/2021-04-26-20-52-16.bpo-43945.NgERXO.rst [new file with mode: 0644]

index ca6aff6f82512ddefb52fbcb618389ab6b4cf78f..bcf411c6b6550cbbbeeb437caee783c502c23c63 100644 (file)
@@ -1005,6 +1005,14 @@ class Enum(metaclass=EnumType):
             val = str(self)
         # mix-in branch
         else:
+            import warnings
+            warnings.warn(
+                    "in 3.12 format() will use the enum member, not the enum member's value;\n"
+                    "use a format specifier, such as :d for an IntEnum member, to maintain"
+                    "the current display",
+                    DeprecationWarning,
+                    stacklevel=2,
+                    )
             cls = self._member_type_
             val = self._value_
         return cls.__format__(val, format_spec)
index 4f28b80293d3523e58f7528e6e3235662adfc15f..983c54b8711991a1d776236711e55d6c65f3608f 100644 (file)
@@ -528,6 +528,14 @@ class TestEnum(unittest.TestCase):
         self.assertEqual(str(TestFloat.one), 'one')
         self.assertEqual('{}'.format(TestFloat.one), 'TestFloat success!')
 
+    @unittest.skipUnless(
+            sys.version_info[:2] < (3, 12),
+            'mixin-format now uses member instead of member.value',
+            )
+    def test_mixin_format_warning(self):
+        with self.assertWarns(DeprecationWarning):
+            self.assertEqual(f'{self.Grades.B}', '4')
+
     def assertFormatIsValue(self, spec, member):
         self.assertEqual(spec.format(member), spec.format(member.value))
 
diff --git a/Misc/NEWS.d/next/Library/2021-04-26-20-52-16.bpo-43945.NgERXO.rst b/Misc/NEWS.d/next/Library/2021-04-26-20-52-16.bpo-43945.NgERXO.rst
new file mode 100644 (file)
index 0000000..c01c200
--- /dev/null
@@ -0,0 +1,2 @@
+[Enum] Deprecate non-standard mixin format() behavior: in 3.12 the enum
+member, not the member's value, will be used for format() calls.