diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-09 08:16:33 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-12-09 08:53:50 -0500 |
commit | f14930e66601b462699c44384c482cd966f53b8f (patch) | |
tree | bea29134419118c1bcb95ca589da5a8e2372e089 /setuptools/py31compat.py | |
parent | ac9997648d89131412eacbb198e2d3a7c97f69e4 (diff) | |
download | external_python_setuptools-f14930e66601b462699c44384c482cd966f53b8f.tar.gz external_python_setuptools-f14930e66601b462699c44384c482cd966f53b8f.tar.bz2 external_python_setuptools-f14930e66601b462699c44384c482cd966f53b8f.zip |
Drop support for Python 2.6, removing lots of compatibility code for a leaner, cleaner codebase. Fixes #878.
Diffstat (limited to 'setuptools/py31compat.py')
-rw-r--r-- | setuptools/py31compat.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py index 44b025d4..4ea95320 100644 --- a/setuptools/py31compat.py +++ b/setuptools/py31compat.py @@ -1,6 +1,3 @@ -import sys -import unittest - __all__ = ['get_config_vars', 'get_path'] try: @@ -42,15 +39,3 @@ except ImportError: except OSError: # removal errors are not the only possible pass self.name = None - - -unittest_main = unittest.main - -_PY31 = (3, 1) <= sys.version_info[:2] < (3, 2) -if _PY31: - # on Python 3.1, translate testRunner==None to TextTestRunner - # for compatibility with Python 2.6, 2.7, and 3.2+ - def unittest_main(*args, **kwargs): - if 'testRunner' in kwargs and kwargs['testRunner'] is None: - kwargs['testRunner'] = unittest.TextTestRunner - return unittest.main(*args, **kwargs) |