summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authororlnub123 <orlnub123@gmail.com>2018-09-12 17:28:53 (GMT)
committerEthan Furman <ethan@stoneleaf.us>2018-09-12 17:28:53 (GMT)
commit0fb9fadd3b3e9e3698647e0b92d49b0b7aacd979 (patch)
tree0a53251ce3c6655e1a291d2c668e74bbb1318ea7 /Misc
parentf52237400b9960d434c5d0676a3479b8c1e8c869 (diff)
downloadcpython-0fb9fadd3b3e9e3698647e0b92d49b0b7aacd979.zip
cpython-0fb9fadd3b3e9e3698647e0b92d49b0b7aacd979.tar.gz
cpython-0fb9fadd3b3e9e3698647e0b92d49b0b7aacd979.tar.bz2
bpo-34282: Fix Enum._convert shadowing members named _convert (GH-8568)
* Fix enum members getting shadowed by parent attributes * Move Enum._convert to EnumMeta._convert_ * Deprecate _convert
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS.d/next/Library/2018-08-31-06-28-03.bpo-34282.ztyXH8.rst2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 0d9431d..9698535 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1178,6 +1178,7 @@ Piet van Oostrum
Tomas Oppelstrup
Jason Orendorff
Bastien Orivel
+orlnub123
Douglas Orr
William Orr
Michele OrrĂ¹
diff --git a/Misc/NEWS.d/next/Library/2018-08-31-06-28-03.bpo-34282.ztyXH8.rst b/Misc/NEWS.d/next/Library/2018-08-31-06-28-03.bpo-34282.ztyXH8.rst
new file mode 100644
index 0000000..79f56f1
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-08-31-06-28-03.bpo-34282.ztyXH8.rst
@@ -0,0 +1,2 @@
+Move ``Enum._convert`` to ``EnumMeta._convert_`` and fix enum members getting
+shadowed by parent attributes.