summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2012-04-20 12:37:17 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2012-04-20 12:37:17 (GMT)
commit63c39fe38e54c986a70dd9f97acf444837d1d244 (patch)
tree038aad8667c580ef236848618548010de9e14b4d /Misc
parent7b17a4e117fa6ad9f0063aa2f039930f40d91820 (diff)
parent63674f4b52aa7c2832fec09a026e24cd521e491b (diff)
downloadcpython-63c39fe38e54c986a70dd9f97acf444837d1d244.zip
cpython-63c39fe38e54c986a70dd9f97acf444837d1d244.tar.gz
cpython-63c39fe38e54c986a70dd9f97acf444837d1d244.tar.bz2
merge 3.2: issue 14629
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS3
1 files changed, 3 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index ac5d91b..b98cdca 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -55,6 +55,9 @@ Core and Builtins
Library
-------
+- Issue #14629: Raise SyntaxError in tokenizer.detect_encoding if the
+ first two lines have non-UTF-8 characters without an encoding declaration.
+
- Issue #14308: Fix an exception when a "dummy" thread is in the threading
module's active list after a fork().