[Python-checkins] cpython (merge default -> default): merge

[brett.cannon]

http://hg.python.org/cpython/rev/95c29787320a
changeset:   76330:95c29787320a
parent:      76329:005fd1fe31ab
parent:      76327:1ca10eb58483
user:        Brett Cannon <brett at python.org>
date:        Sun Apr 15 15:25:10 2012 -0400
summary:
  merge

files:
  Lib/importlib/_bootstrap.py |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -23,7 +23,7 @@
 
 
 def _make_relax_case():
-    if any(map(sys.platform.startswith, CASE_INSENSITIVE_PLATFORMS)):
+    if sys.platform.startswith(CASE_INSENSITIVE_PLATFORMS):
         def _relax_case():
             """True if filenames must be checked case-insensitively."""
             return b'PYTHONCASEOK' in _os.environ
@@ -163,7 +163,7 @@
 def verbose_message(message, *args):
     """Print the message to stderr if -v/PYTHONVERBOSE is turned on."""
     if sys.flags.verbose:
-        if not message.startswith('#') and not message.startswith('import '):
+        if not message.startswith(('#', 'import ')):
             message = '# ' + message
         print(message.format(*args), file=sys.stderr)
 

-- 
Repository URL: http://hg.python.org/cpython