From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Tue, 12 May 2009 10:49:13 +0000 (+0000)
Subject: Better fix for modules using unittest.main(). Fixes regression caused by commit for... 
X-Git-Tag: v2.7a1~1206
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f596a5125a50c8e2026984531e9be3fc111b3d49;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/unittest.py b/Lib/unittest.py
index d781354ba420..5858d89e485a 100644
--- a/Lib/unittest.py
+++ b/Lib/unittest.py
@@ -1567,7 +1567,7 @@ Examples:
                 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,)