summaryrefslogtreecommitdiff
path: root/Lib/traceback.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
committerMartin Panter <vadmium+py@gmail.com>2016-05-26 06:03:19 +0000
commit3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1 (patch)
tree31de97216c771e456051ddbe31fc338ddf0f8b9f /Lib/traceback.py
parent4d4bc42c8b2b4b546b36e0c3ecb1e86d57017cee (diff)
parent46f50726a0047ae81d478c3a206f587b8f35ed08 (diff)
downloadcpython-git-3e04d5b3068ac67cc01a32b1d5a51ac79c9df5a1.tar.gz
Issue #27076: Merge spelling from 3.5
Diffstat (limited to 'Lib/traceback.py')
-rw-r--r--Lib/traceback.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/traceback.py b/Lib/traceback.py
index 1bac6eb56b..3b46c0b050 100644
--- a/Lib/traceback.py
+++ b/Lib/traceback.py
@@ -136,7 +136,7 @@ def format_exception_only(etype, value):
return list(TracebackException(etype, value, None).format_exception_only())
-# -- not offical API but folk probably use these two functions.
+# -- not official API but folk probably use these two functions.
def _format_final_exc_line(etype, value):
valuestr = _some_str(value)
@@ -418,13 +418,13 @@ class TracebackException:
- :attr:`stack` A `StackSummary` representing the traceback.
- :attr:`exc_type` The class of the original traceback.
- :attr:`filename` For syntax errors - the filename where the error
- occured.
+ occurred.
- :attr:`lineno` For syntax errors - the linenumber where the error
- occured.
+ occurred.
- :attr:`text` For syntax errors - the text where the error
- occured.
+ occurred.
- :attr:`offset` For syntax errors - the offset into the text where the
- error occured.
+ error occurred.
- :attr:`msg` For syntax errors - the compiler error message.
"""