diff options
| author | R David Murray <rdmurray@bitdance.com> | 2015-12-05 03:54:38 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2015-12-05 03:54:38 (GMT) |
| commit | ced699b4c7e79e0a53e3ca7f2d789b761d4a9e76 (patch) | |
| tree | 6d129c7f79a8dccd49a65adbb57b45f075b3d98b | |
| parent | afdd51343cafbc02443fa6f7a2166af951a67c64 (diff) | |
| download | cpython-ced699b4c7e79e0a53e3ca7f2d789b761d4a9e76.zip cpython-ced699b4c7e79e0a53e3ca7f2d789b761d4a9e76.tar.gz cpython-ced699b4c7e79e0a53e3ca7f2d789b761d4a9e76.tar.bz2 | |
#24903: Remove misleading error message to fix regression.
Before the argparse conversion, compileall would (sometimes) accept multiple
paths when -d was specified. Afterward, it does not. The corresponding check
in the original code claimed to prevent multiple *directories* from being
specified...but it didn't really work even to do that. So this patch fixes
the regression by invoking the consenting adults rule: if you specify a
combination of arguments to compileall that produces files with inconsistent
destdirs (which you could do before), it is on you.
Patch by Jake Garver.
| -rw-r--r-- | Lib/compileall.py | 3 | ||||
| -rw-r--r-- | Lib/test/test_compileall.py | 8 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 4 |
4 files changed, 5 insertions, 11 deletions
diff --git a/Lib/compileall.py b/Lib/compileall.py index d957ee5..8e1569c 100644 --- a/Lib/compileall.py +++ b/Lib/compileall.py @@ -196,9 +196,6 @@ def main(): 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: import re args.rx = re.compile(args.rx) diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py index 7b307ed..7c61fa3 100644 --- a/Lib/test/test_compileall.py +++ b/Lib/test/test_compileall.py @@ -323,14 +323,6 @@ class CommandLineTests(unittest.TestCase): self.assertCompiled(init2fn) 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): script_helper.make_script(self.pkgdir, 'crunchyfrog', 'bad(syntax') rc, out, err = self.assertRunNotOK('-q', '-d', 'dinsdale', self.pkgdir) @@ -470,6 +470,7 @@ Raymund Galvin Nitin Ganatra Fred Gansevles Lars Marius Garshol +Jake Garver Dan Gass Andrew Gaul Matthieu Gautier @@ -115,6 +115,10 @@ Core and Builtins 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 fork() failure when preexec_fn is used. |