[Python-checkins] r72583 - python/trunk/Lib/unittest.py

michael.foord python-checkins at python.org
Tue May 12 12:49:13 CEST 2009


Author: michael.foord
Date: Tue May 12 12:49:13 2009
New Revision: 72583

Log:
Better fix for modules using unittest.main(). Fixes regression caused by commit for issue 5995. Michael Foord

Modified:
   python/trunk/Lib/unittest.py

Modified: python/trunk/Lib/unittest.py
==============================================================================
--- python/trunk/Lib/unittest.py	(original)
+++ python/trunk/Lib/unittest.py	Tue May 12 12:49:13 2009
@@ -1567,7 +1567,7 @@
                 return
             if len(args) > 0:
                 self.testNames = args
-                if os.path.splitext(os.path.basename(__file__))[0] == 'unitest':
+                if sys.modules['unittest'] is sys.modules['__main__']:
                     self.module = None
             else:
                 self.testNames = (self.defaultTest,)


More information about the Python-checkins mailing list