Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-03-20 15:34:28 +02:00
commit 45763d0d12
2 changed files with 9 additions and 2 deletions

View file

@ -189,7 +189,7 @@ class TestCommandLineArgs(unittest.TestCase):
class FakeTP(unittest.TestProgram):
def parseArgs(self, *args, **kw): pass
def runTests(self, *args, **kw): pass
warnoptions = sys.warnoptions
warnoptions = sys.warnoptions[:]
try:
sys.warnoptions[:] = []
# no warn options, no arg -> default