summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaymond Hettinger <python@rcn.com>2016-12-30 06:57:31 (GMT)
committerRaymond Hettinger <python@rcn.com>2016-12-30 06:57:31 (GMT)
commitfd5fe14acb28b5d0b3bc211945ed20f338c9cde9 (patch)
tree0e2e53c67842283fa7e5da61f4d8d4f643b57d26
parent3d8fcfe0f50cf0ca7039182152fd7ff3032ea7fd (diff)
parent381dc6c22f20505b9ea9e3c9342705eed554e441 (diff)
downloadcpython-fd5fe14acb28b5d0b3bc211945ed20f338c9cde9.zip
cpython-fd5fe14acb28b5d0b3bc211945ed20f338c9cde9.tar.gz
cpython-fd5fe14acb28b5d0b3bc211945ed20f338c9cde9.tar.bz2
merge
-rw-r--r--Lib/enum.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/enum.py b/Lib/enum.py
index 3f5ecbb..e79b038 100644
--- a/Lib/enum.py
+++ b/Lib/enum.py
@@ -1,7 +1,7 @@
import sys
from types import MappingProxyType, DynamicClassAttribute
from functools import reduce
-from operator import or_ as _or_, and_ as _and_, xor, neg
+from operator import or_ as _or_
# try _collections first to reduce startup cost
try: