commit c36bf9918929ae37db1fea149ff9d9d408e62943
author Michael Foord <michael@voidspace.org.uk> Mon Feb 11 12:53:21 2013 +0000
committer Michael Foord <michael@voidspace.org.uk> Mon Feb 11 12:53:21 2013 +0000
tree 1aea468e9481425b43e03cf121071757d81cc863
parent cb66ee7f56fe66d4b4cb7bc6abe6e1314e98b5c9

Correction to issue 17052 fix

Lib/unittest/main.py

diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index 1e001a6..b253679 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -159,7 +159,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

Lib/unittest/test/test_discovery.py

diff --git a/Lib/unittest/test/test_discovery.py b/Lib/unittest/test/test_discovery.py
index 3dec2ee..8c031a0 100644
--- a/Lib/unittest/test/test_discovery.py
+++ b/Lib/unittest/test/test_discovery.py
@@ -236,7 +236,7 @@
                 self.args.append((start_dir, pattern, top_level_dir))
                 return 'tests'
 
-        program.testLoader = Loader
+        program.testLoader = Loader()
         program._do_discovery(['-v'])
         self.assertEqual(Loader.args, [('.', 'test*.py', None)])