summaryrefslogtreecommitdiffstats
path: root/Misc/HISTORY
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2015-10-31 12:16:18 (GMT)
committerMartin Panter <vadmium+py@gmail.com>2015-10-31 12:16:18 (GMT)
commit4827e488a4d1d82eb7bfeb194a7ad1d420535513 (patch)
tree3b561031a30e1c2329dce853e11ae76b2f08c2f9 /Misc/HISTORY
parentc02948126c851b53109e4c0b4b11f26a62cceba9 (diff)
parent1f1177d69a21805c374b6b4cfce9f9f76bceb822 (diff)
downloadcpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.zip
cpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.tar.gz
cpython-4827e488a4d1d82eb7bfeb194a7ad1d420535513.tar.bz2
Merge spelling fixes from 3.4 into 3.5
Diffstat (limited to 'Misc/HISTORY')
-rw-r--r--Misc/HISTORY2
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/HISTORY b/Misc/HISTORY
index 956d320..bca793c 100644
--- a/Misc/HISTORY
+++ b/Misc/HISTORY
@@ -1968,7 +1968,7 @@ Core and Builtins
change also applies to bytes.splitlines and bytearray.splitlines.
- Issue #7732: Don't open a directory as a file anymore while importing a
- module. Ignore the direcotry if its name matchs the module name (e.g.
+ module. Ignore the directory if its name matches the module name (e.g.
"__init__.py") and raise a ImportError instead.
- Issue #13021: Missing decref on an error path. Thanks to Suman Saha for