summaryrefslogtreecommitdiff
path: root/setuptools/config.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2017-11-20 13:12:05 -0500
committerJason R. Coombs <jaraco@jaraco.com>2017-11-20 13:12:05 -0500
commit89ef5bb7e4812193d6f593d531bad36191517981 (patch)
tree1c5dccb410d9a740d1461cd07249af4c233ad120 /setuptools/config.py
parent45ec75beccba6432b3ed7b80fd84b65276453e9d (diff)
parentc6fe76cbc22ac6ac64709a0381a6ce48a8c9884a (diff)
downloadpython-setuptools-git-89ef5bb7e4812193d6f593d531bad36191517981.tar.gz
Drop support for Python 2.6 by merging the drop-py26 branch. Fixes #878.
Diffstat (limited to 'setuptools/config.py')
-rw-r--r--setuptools/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/config.py b/setuptools/config.py
index 9a62e2ec..53828447 100644
--- a/setuptools/config.py
+++ b/setuptools/config.py
@@ -4,9 +4,9 @@ import os
import sys
from collections import defaultdict
from functools import partial
+from importlib import import_module
from distutils.errors import DistutilsOptionError, DistutilsFileError
-from setuptools.py26compat import import_module
from setuptools.extern.six import string_types