Merge typo fixes from 3.5

This commit is contained in:
Martin Panter 2016-04-05 06:20:32 +00:00
commit c86c91aab0
7 changed files with 13 additions and 13 deletions

View file

@ -43,7 +43,7 @@ def _formatwarnmsg_impl(msg):
line = linecache.getline(msg.filename, msg.lineno)
except Exception:
# When a warning is logged during Python shutdown, linecache
# and the improt machinery don't work anymore
# and the import machinery don't work anymore
line = None
linecache = None
else: