From: Michael Foord Date: Mon, 11 Feb 2013 13:29:58 +0000 (+0000) Subject: Merge X-Git-Tag: v3.3.1rc1~185 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b71b8ec7b1d3ae8eb4f446387f766aea7d7d831b;p=python Merge --- b71b8ec7b1d3ae8eb4f446387f766aea7d7d831b diff --cc Lib/unittest/main.py index 061916c052,63c8139000..ead64936a0 --- a/Lib/unittest/main.py +++ b/Lib/unittest/main.py @@@ -220,15 -227,6 +220,15 @@@ class TestProgram(object) parser.add_option('-t', '--top-level-directory', dest='top', default=None, help='Top level directory of project (defaults to start directory)') + 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 + parser = self._getOptParser() + self._addDiscoveryOptions(parser) + options, args = parser.parse_args(argv) if len(args) > 3: self.usageExit() diff --cc Misc/NEWS index 0534ef1b07,1f772b7241..5b90097c36 --- a/Misc/NEWS +++ b/Misc/NEWS @@@ -175,10 -221,8 +175,10 @@@ Core and Builtin Library ------- - - Issue #17502: unittest discovery should use self.testLoader. + - Issue #17052: unittest discovery should use self.testLoader. +- Issue #4591: Uid and gid values larger than 2**31 are supported now. + - Issue #17141: random.vonmisesvariate() no more hangs for large kappas. - Issue #17149: Fix random.vonmisesvariate to always return results in