Commitb838d80

authored

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

1 parent56d055a commitb838d80Copy full SHA for b838d80

File tree

+23

-0

lines changed

+23

-0

lines changed

Lines changed: 5 additions & 0 deletions

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_gnvisnotNoneandtype(_gnv)isnotstaticmethod:`
	`523`	`+_gnv=staticmethod(_gnv)`
`521`	`524`	`# convert to normal dict`
`522`	`525`	`classdict=dict(classdict.items())`
	`526`	`+if_gnvisnotNone:`
	`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)`

Lines changed: 17 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -270,6 +270,17 @@ class NewSubEnum(NewBaseEnum):`
`270`	`270`	`first=auto()`
`271`	`271`	`self.NewSubEnum=NewSubEnum`
`272`	`272`	`#`
	`273`	`+classLazyGNV(self.enum_type):`
	`274`	`+def_generate_next_value_(name,start,last,values):`
	`275`	`+pass`
	`276`	`+self.LazyGNV=LazyGNV`
	`277`	`+#`
	`278`	`+classBusyGNV(self.enum_type):`
	`279`	`+@staticmethod`
	`280`	`+def_generate_next_value_(name,start,last,values):`
	`281`	`+pass`
	`282`	`+self.BusyGNV=BusyGNV`
	`283`	`+#`
`273`	`284`	`self.is_flag=False`
`274`	`285`	`self.names= ['first','second','third']`
`275`	`286`	`ifissubclass(MainEnum,StrEnum):`
`@@ -466,6 +477,12 @@ def test_enum_in_enum_out(self):`
`466`	`477`	`Main=self.MainEnum`
`467`	`478`	`self.assertIs(Main(Main.first),Main.first)`
`468`	`479`
	`480`	`+deftest_gnv_is_static(self):`
	`481`	`+lazy=self.LazyGNV`
	`482`	`+busy=self.BusyGNV`
	`483`	`+self.assertTrue(type(lazy.__dict__['_generate_next_value_'])isstaticmethod)`
	`484`	`+self.assertTrue(type(busy.__dict__['_generate_next_value_'])isstaticmethod)`
	`485`	`+`
`469`	`486`	`deftest_hash(self):`
`470`	`487`	`MainEnum=self.MainEnum`
`471`	`488`	`mapping= {}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Ensure final ``_generate_next_value_`` is a ``staticmethod``.

Comments

(0)