From 9937d7d8f536c32c2f38e3dc665f19e70ad0a537 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Mon, 7 Apr 2014 13:58:29 +0200 Subject: [PATCH] Issue #183: Really fix test command with Python 3.1. --- CHANGES.txt | 6 ++++++ setuptools/py31compat.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 5980f7af3d..512127b3d3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ CHANGES ======= +----- +3.4.3 +----- + +* Issue #183: Really fix test command with Python 3.1. + ----- 3.4.2 ----- diff --git a/setuptools/py31compat.py b/setuptools/py31compat.py index 6e76558293..c487ac0439 100644 --- a/setuptools/py31compat.py +++ b/setuptools/py31compat.py @@ -44,9 +44,9 @@ def __exit__(self, exctype, excvalue, exctrace): _PY31 = (3, 1) <= sys.version_info[:2] < (3, 2) if _PY31: - # on Python 3.1, translate testRunner==None to defaultTestLoader + # 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.defaultTestLoader + kwargs['testRunner'] = unittest.TextTestRunner return unittest.main(*args, **kwargs)