traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor reformat of enum tests (GH-22259) 

Automerge-Triggered-By: @ethanfurman
This commit is contained in:
Ethan Furman 2020-09-15 12:27:06 -07:00 committed by GitHub
parent 5531269f69
commit 5a565b3d7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
Lib/test/test_enum.py
View File

@ -420,8 +420,10 @@ class TestEnum(unittest.TestCase):
blue = 3 blue = 3
def test_reserved__sunder_(self): def test_reserved__sunder_(self):
with self.assertRaisesRegex(ValueError, '_sunder_ names, such as ' with self.assertRaisesRegex(
'"_bad_", are reserved'): ValueError,
'_sunder_ names, such as "_bad_", are reserved',
):
class Bad(Enum): class Bad(Enum):
_bad_ = 1 _bad_ = 1
@ -1136,9 +1138,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1153,7 +1157,8 @@ class TestEnum(unittest.TestCase):
if isinstance(self, NamedInt) and isinstance(other, NamedInt): if isinstance(self, NamedInt) and isinstance(other, NamedInt):
return NamedInt( return NamedInt(
'({0} + {1})'.format(self.__name__, other.__name__), '({0} + {1})'.format(self.__name__, other.__name__),
temp ) temp,
)
else: else:
return temp return temp
@ -1193,9 +1198,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1210,7 +1217,8 @@ class TestEnum(unittest.TestCase):
if isinstance(self, NamedInt) and isinstance(other, NamedInt): if isinstance(self, NamedInt) and isinstance(other, NamedInt):
return NamedInt( return NamedInt(
'({0} + {1})'.format(self.__name__, other.__name__), '({0} + {1})'.format(self.__name__, other.__name__),
temp ) temp,
)
else: else:
return temp return temp
@ -1250,9 +1258,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1267,7 +1277,8 @@ class TestEnum(unittest.TestCase):
if isinstance(self, NamedInt) and isinstance(other, NamedInt): if isinstance(self, NamedInt) and isinstance(other, NamedInt):
return NamedInt( return NamedInt(
'({0} + {1})'.format(self.__name__, other.__name__), '({0} + {1})'.format(self.__name__, other.__name__),
temp ) temp,
)
else: else:
return temp return temp
@ -1307,9 +1318,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1324,7 +1337,8 @@ class TestEnum(unittest.TestCase):
if isinstance(self, NamedInt) and isinstance(other, NamedInt): if isinstance(self, NamedInt) and isinstance(other, NamedInt):
return NamedInt( return NamedInt(
'({0} + {1})'.format(self.__name__, other.__name__), '({0} + {1})'.format(self.__name__, other.__name__),
temp ) temp,
)
else: else:
return temp return temp
@ -1333,7 +1347,6 @@ class TestEnum(unittest.TestCase):
x = ('the-x', 1) x = ('the-x', 1)
y = ('the-y', 2) y = ('the-y', 2)
self.assertIs(NEI.__new__, Enum.__new__) self.assertIs(NEI.__new__, Enum.__new__)
self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)") self.assertEqual(repr(NEI.x + NEI.y), "NamedInt('(the-x + the-y)', 3)")
globals()['NamedInt'] = NamedInt globals()['NamedInt'] = NamedInt
@ -1362,9 +1375,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1415,9 +1430,11 @@ class TestEnum(unittest.TestCase):
return self._intname return self._intname
def __repr__(self): def __repr__(self):
# repr() is updated to include the name and type info # repr() is updated to include the name and type info
return "{}({!r}, {})".format(type(self).__name__, return "{}({!r}, {})".format(
self.__name__, type(self).__name__,
int.__repr__(self)) self.__name__,
int.__repr__(self),
)
def __str__(self): def __str__(self):
# str() is unchanged, even if it relies on the repr() fallback # str() is unchanged, even if it relies on the repr() fallback
base = int base = int
@ -1432,7 +1449,8 @@ class TestEnum(unittest.TestCase):
if isinstance(self, NamedInt) and isinstance(other, NamedInt): if isinstance(self, NamedInt) and isinstance(other, NamedInt):
return NamedInt( return NamedInt(
'({0} + {1})'.format(self.__name__, other.__name__), '({0} + {1})'.format(self.__name__, other.__name__),
temp ) temp,
)
else: else:
return temp return temp