[Python-checkins] bpo-41811: create SortKey members using first given value (GH-22316) (GH-22326)

Miss Islington (bot) webhook-mailer at python.org
Sat Sep 19 15:56:34 EDT 2020


https://github.com/python/cpython/commit/488e3eb70d24d5ce55ae0d7aed13a3721d3eb8a1
commit: 488e3eb70d24d5ce55ae0d7aed13a3721d3eb8a1
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-09-19T12:56:30-07:00
summary:

bpo-41811: create SortKey members using first given value (GH-22316) (GH-22326)

(cherry picked from commit ae0d2a33ec05aece939a959d36fcf1df1e210a08)

Co-authored-by: Ethan Furman <ethan at stoneleaf.us>

files:
M Lib/pstats.py
M Lib/test/test_pstats.py

diff --git a/Lib/pstats.py b/Lib/pstats.py
index 4b419a8ecdb6c..67a68ebe750b5 100644
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -43,9 +43,9 @@ class SortKey(str, Enum):
     TIME = 'time', 'tottime'
 
     def __new__(cls, *values):
-        obj = str.__new__(cls)
-
-        obj._value_ = values[0]
+        value = values[0]
+        obj = str.__new__(cls, value)
+        obj._value_ = value
         for other_value in values[1:]:
             cls._value2member_map_[other_value] = obj
         obj._all_values = values
diff --git a/Lib/test/test_pstats.py b/Lib/test/test_pstats.py
index f835ce309a60e..052a3b9c3d5ee 100644
--- a/Lib/test/test_pstats.py
+++ b/Lib/test/test_pstats.py
@@ -76,5 +76,9 @@ def test_sort_starts_mix(self):
                           'calls')
 
 
+    def test_SortKey_enum(self):
+        self.assertEqual(SortKey.FILENAME, 'filename')
+        self.assertNotEqual(SortKey.FILENAME, SortKey.CALLS)
+
 if __name__ == "__main__":
     unittest.main()



More information about the Python-checkins mailing list