merge

brettcannon · brettcannon · commit 7788838473aa · 2012-04-15T15:25:10.000-04:00
diff --git 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 _wrap(new, old):
 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)
 
