diff options
| author | Ethan Furman <ethan@stoneleaf.us> | 2021-04-20 02:12:24 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-20 02:12:24 (GMT) |
| commit | 503cdc7c124cebbd777008bdf7bd9aa666b25f07 (patch) | |
| tree | ed9e0d1622622b1c37940d312de7d6e679bc8db2 /Lib/test/test_unicode.py | |
| parent | dbac8f40e81eb0a29dc833e6409a1abf47467da6 (diff) | |
| download | cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.zip cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.tar.gz cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.tar.bz2 | |
Revert "bpo-38659: [Enum] add _simple_enum decorator (GH-25285)" (GH-25476)
This reverts commit dbac8f40e81eb0a29dc833e6409a1abf47467da6.
Diffstat (limited to 'Lib/test/test_unicode.py')
| -rw-r--r-- | Lib/test/test_unicode.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py index 0e6cbb6..d47cf28 100644 --- a/Lib/test/test_unicode.py +++ b/Lib/test/test_unicode.py @@ -1463,21 +1463,20 @@ class UnicodeTest(string_tests.CommonTest, PI = 3.1415926 class Int(enum.IntEnum): IDES = 15 - class Str(enum.StrEnum): - # StrEnum uses the value and not the name for %s etc. + class Str(str, enum.Enum): ABC = 'abc' # Testing Unicode formatting strings... self.assertEqual("%s, %s" % (Str.ABC, Str.ABC), - 'abc, abc') + 'ABC, ABC') self.assertEqual("%s, %s, %d, %i, %u, %f, %5.2f" % (Str.ABC, Str.ABC, Int.IDES, Int.IDES, Int.IDES, Float.PI, Float.PI), - 'abc, abc, 15, 15, 15, 3.141593, 3.14') + 'ABC, ABC, 15, 15, 15, 3.141593, 3.14') # formatting jobs delegated from the string implementation: self.assertEqual('...%(foo)s...' % {'foo':Str.ABC}, - '...abc...') + '...ABC...') self.assertEqual('...%(foo)s...' % {'foo':Int.IDES}, '...IDES...') self.assertEqual('...%(foo)i...' % {'foo':Int.IDES}, |