commit cb66ee7f56fe66d4b4cb7bc6abe6e1314e98b5c9
author Michael Foord <michael@voidspace.org.uk> Sun Feb 10 23:59:46 2013 +0000
committer Michael Foord <michael@voidspace.org.uk> Sun Feb 10 23:59:46 2013 +0000
tree ae5778d85c5fad29f616c33cb6344eddd6d74f54
parent 65d56390bbf74553221dd94123c9f04776c6f8cb

Issue 17502: unittest discovery should use self.testLoader

Lib/unittest/main.py

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 3396bb0..1e001a6 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -157,7 +157,10 @@
             self.test = self.testLoader.loadTestsFromNames(self.testNames,
                                                            self.module)
 
-    def _do_discovery(self, argv, Loader=loader.TestLoader):
+    def _do_discovery(self, argv, Loader=None):
+        if Loader is None:
+            Loader = self.testLoader
+
         # handle command line args for test discovery
         self.progName = '%s discover' % self.progName
         import optparse