summaryrefslogtreecommitdiffstats
path: root/Lib/warnings.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-04-05 06:20:32 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2016-04-05 06:20:32 (GMT)
commitc86c91aab02b4ce242b5497256328a880bfdecb4 (patch)
treea25973ae1e46ea7e22eb2fabdd3d8073a029a285 /Lib/warnings.py
parent16ca06b8cb2426b540fdab75914d7cd0f715b7f0 (diff)
parentcc71a795df4986bca5f88ce1e30f81608ca7387d (diff)
downloadcpython-c86c91aab02b4ce242b5497256328a880bfdecb4.zip
cpython-c86c91aab02b4ce242b5497256328a880bfdecb4.tar.gz
cpython-c86c91aab02b4ce242b5497256328a880bfdecb4.tar.bz2
Merge typo fixes from 3.5
Diffstat (limited to 'Lib/warnings.py')
-rw-r--r--Lib/warnings.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/warnings.py b/Lib/warnings.py
index 1ece514..f4c8cdc 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -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: