| commit | b71b8ec7b1d3ae8eb4f446387f766aea7d7d831b | [log] [tgz] |
|---|---|---|
| author | Michael Foord <michael@voidspace.org.uk> | Mon Feb 11 13:29:58 2013 +0000 |
| committer | Michael Foord <michael@voidspace.org.uk> | Mon Feb 11 13:29:58 2013 +0000 |
| tree | 51408c0663aa285ca7510a51a78edf0dfef152e0 | |
| parent | a23a39c07d3027e5139cc6127783cab23ca1a511 [diff] [blame] | |
| parent | f78f5b11f65ff6fd582d937615e8a1c3c8373662 [diff] [blame] |
Merge
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py index 061916c..ead6493 100644 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py
@@ -222,7 +222,7 @@ def _do_discovery(self, argv, Loader=None): if Loader is None: - Loader = self.testLoader + Loader = lambda: self.testLoader # handle command line args for test discovery self.progName = '%s discover' % self.progName