Merge: #24903: Remove misleading error message to fix regression.

This commit is contained in:
R David Murray 2015-12-04 23:04:37 -05:00
commit 939614c48c
4 changed files with 5 additions and 11 deletions

View file

@ -238,9 +238,6 @@ def main():
args = parser.parse_args() args = parser.parse_args()
compile_dests = args.compile_dest compile_dests = args.compile_dest
if (args.ddir and (len(compile_dests) != 1
or not os.path.isdir(compile_dests[0]))):
parser.exit('-d destdir requires exactly one directory argument')
if args.rx: if args.rx:
import re import re
args.rx = re.compile(args.rx) args.rx = re.compile(args.rx)

View file

@ -398,14 +398,6 @@ class CommandLineTests(unittest.TestCase):
self.assertCompiled(init2fn) self.assertCompiled(init2fn)
self.assertCompiled(bar2fn) self.assertCompiled(bar2fn)
def test_d_takes_exactly_one_dir(self):
rc, out, err = self.assertRunNotOK('-d', 'foo')
self.assertEqual(out, b'')
self.assertRegex(err, b'-d')
rc, out, err = self.assertRunNotOK('-d', 'foo', 'bar')
self.assertEqual(out, b'')
self.assertRegex(err, b'-d')
def test_d_compile_error(self): def test_d_compile_error(self):
script_helper.make_script(self.pkgdir, 'crunchyfrog', 'bad(syntax') script_helper.make_script(self.pkgdir, 'crunchyfrog', 'bad(syntax')
rc, out, err = self.assertRunNotOK('-q', '-d', 'dinsdale', self.pkgdir) rc, out, err = self.assertRunNotOK('-q', '-d', 'dinsdale', self.pkgdir)

View file

@ -477,6 +477,7 @@ Raymund Galvin
Nitin Ganatra Nitin Ganatra
Fred Gansevles Fred Gansevles
Lars Marius Garshol Lars Marius Garshol
Jake Garver
Dan Gass Dan Gass
Andrew Gaul Andrew Gaul
Matthieu Gautier Matthieu Gautier

View file

@ -22,6 +22,10 @@ Core and Builtins
Library Library
------- -------
- Issue #24903: Fix regression in number of arguments compileall accepts when
'-d' is specified. The check on the number of arguments has been dropped
completely as it never worked correctly anyway.
- Issue #25764: In the subprocess module, preserve any exception caused by - Issue #25764: In the subprocess module, preserve any exception caused by
fork() failure when preexec_fn is used. fork() failure when preexec_fn is used.