summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-04-15 19:25:10 (GMT)
committerBrett Cannon <brett@python.org>2012-04-15 19:25:10 (GMT)
commit7788838473aa3993d29fcf9de25605d492f25d29 (patch)
treeecb6885114b6ef3c46ac9679d2c569c3751d6dc2
parent881535b726c595582920acc69f26b053e32b85b0 (diff)
parentf8f3190d321b54c14eccffef1d12021417a6719c (diff)
downloadcpython-7788838473aa3993d29fcf9de25605d492f25d29.zip
cpython-7788838473aa3993d29fcf9de25605d492f25d29.tar.gz
cpython-7788838473aa3993d29fcf9de25605d492f25d29.tar.bz2
merge
-rw-r--r--Lib/importlib/_bootstrap.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
index 0135217..1c5bc56 100644
--- a/Lib/importlib/_bootstrap.py
+++ b/Lib/importlib/_bootstrap.py
@@ -23,7 +23,7 @@ CASE_INSENSITIVE_PLATFORMS = 'win', 'cygwin', 'darwin'
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 @@ code_type = type(_wrap.__code__)
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)