gh-103056: [Enum] ensure final _generate_next_value_ is a staticmethod (GH-103062)

ethanfurman · web-flow · commit b838d80085b0 · 2023-03-27T16:25:19.000-07:00
diff --git a/Lib/enum.py b/Lib/enum.py
@@ -518,8 +518,13 @@ def __new__(metacls, cls, bases, classdict, *, boundary=None, _simple=False, **k
         #
         # adjust the sunders
         _order_ = classdict.pop('_order_', None)
+        _gnv = classdict.get('_generate_next_value_')
+        if _gnv is not None and type(_gnv) is not staticmethod:
+            _gnv = staticmethod(_gnv)
         # convert to normal dict
         classdict = dict(classdict.items())
+        if _gnv is not None:
+            classdict['_generate_next_value_'] = _gnv
         #
         # data type of member and the controlling Enum class
         member_type, first_enum = metacls._get_mixins_(cls, bases)
diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py
@@ -270,6 +270,17 @@ class NewSubEnum(NewBaseEnum):
             first = auto()
         self.NewSubEnum = NewSubEnum
         #
+        class LazyGNV(self.enum_type):
+            def _generate_next_value_(name, start, last, values):
+                pass
+        self.LazyGNV = LazyGNV
+        #
+        class BusyGNV(self.enum_type):
+            @staticmethod
+            def _generate_next_value_(name, start, last, values):
+                pass
+        self.BusyGNV = BusyGNV
+        #
         self.is_flag = False
         self.names = ['first', 'second', 'third']
         if issubclass(MainEnum, StrEnum):
@@ -466,6 +477,12 @@ def test_enum_in_enum_out(self):
         Main = self.MainEnum
         self.assertIs(Main(Main.first), Main.first)
 
+    def test_gnv_is_static(self):
+        lazy = self.LazyGNV
+        busy = self.BusyGNV
+        self.assertTrue(type(lazy.__dict__['_generate_next_value_']) is staticmethod)
+        self.assertTrue(type(busy.__dict__['_generate_next_value_']) is staticmethod)
+
     def test_hash(self):
         MainEnum = self.MainEnum
         mapping = {}
diff --git a/Misc/NEWS.d/next/Library/2023-03-27-15-01-16.gh-issue-103056.-Efh5Q.rst b/Misc/NEWS.d/next/Library/2023-03-27-15-01-16.gh-issue-103056.-Efh5Q.rst
@@ -0,0 +1 @@
+Ensure final ``_generate_next_value_`` is a ``staticmethod``.

Original file line number	Diff line number	Diff line change
`@@ -518,8 +518,13 @@ def __new__(metacls, cls, bases, classdict, , boundary=None, _simple=False, *k`
`518`	`518`	`#`
`519`	`519`	`# adjust the sunders`
`520`	`520`	`_order_ = classdict.pop('_order_', None)`
	`521`	`+ _gnv = classdict.get('_generate_next_value_')`
	`522`	`+ if _gnv is not None and type(_gnv) is not staticmethod:`
	`523`	`+ _gnv = staticmethod(_gnv)`
`521`	`524`	`# convert to normal dict`
`522`	`525`	`classdict = dict(classdict.items())`
	`526`	`+ if _gnv is not None:`
	`527`	`+ classdict['_generate_next_value_'] = _gnv`
`523`	`528`	`#`
`524`	`529`	`# data type of member and the controlling Enum class`
`525`	`530`	`member_type, first_enum = metacls._get_mixins_(cls, bases)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Ensure final ``_generate_next_value_`` is a ``staticmethod``.