From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 16 Dec 2013 01:56:00 +0000 (-0500)
Subject: Merge: #19532: make compileall with no file/dir args respect -f and -q.
X-Git-Tag: v3.4.0b2~208
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=755d5ea12aff91dfc4c4fe7302d911da33fffa82;p=thirdparty%2FPython%2Fcpython.git

Merge: #19532: make compileall with no file/dir args respect -f and -q.
---

755d5ea12aff91dfc4c4fe7302d911da33fffa82
diff --cc Lib/test/test_compileall.py
index ff2515df4cf1,0505c521d1c4..2a42238755c7
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@@ -5,8 -5,7 +5,6 @@@ import o
  import py_compile
  import shutil
  import struct
--import subprocess
- import sys
  import tempfile
  import time
  import unittest
@@@ -181,6 -177,29 +179,29 @@@ class CommandLineTests(unittest.TestCas
          self.assertNotCompiled(self.initfn)
          self.assertNotCompiled(self.barfn)
  
+     def test_no_args_respects_force_flag(self):
+         bazfn = script_helper.make_script(self.directory, 'baz', '')
+         self.assertRunOK(PYTHONPATH=self.directory)
 -        pycpath = imp.cache_from_source(bazfn)
++        pycpath = importlib.util.cache_from_source(bazfn)
+         # Set atime/mtime backward to avoid file timestamp resolution issues
+         os.utime(pycpath, (time.time()-60,)*2)
+         mtime = os.stat(pycpath).st_mtime
+         # Without force, no recompilation
+         self.assertRunOK(PYTHONPATH=self.directory)
+         mtime2 = os.stat(pycpath).st_mtime
+         self.assertEqual(mtime, mtime2)
+         # Now force it.
+         self.assertRunOK('-f', PYTHONPATH=self.directory)
+         mtime2 = os.stat(pycpath).st_mtime
+         self.assertNotEqual(mtime, mtime2)
+ 
+     def test_no_args_respects_quiet_flag(self):
+         script_helper.make_script(self.directory, 'baz', '')
+         noisy = self.assertRunOK(PYTHONPATH=self.directory)
+         self.assertIn(b'Listing ', noisy)
+         quiet = self.assertRunOK('-q', PYTHONPATH=self.directory)
+         self.assertNotIn(b'Listing ', quiet)
+ 
      # Ensure that the default behavior of compileall's CLI is to create
      # PEP 3147 pyc/pyo files.
      for name, ext, switch in [
diff --cc Misc/NEWS
index e1a5c5469a7f,73625f3a5a74..3819d6cb7a72
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -44,11 -29,11 +44,14 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #19532: python -m compileall with no filename/directory arguments now
+   respects the -f and -q flags instead of ignoring them.
+ 
  - Issue #19623: Fixed writing to unseekable files in the aifc module.
  
 +- Issue #19946: multiprocessing.spawn now raises ImportError when the module to
 +  be used as the main module cannot be imported.
 +
  - Issue #17919: select.poll.register() again works with poll.POLLNVAL on AIX.
    Fixed integer overflow in the eventmask parameter.