summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/audioop.rst6
-rw-r--r--Lib/idlelib/EditorWindow.py2
-rw-r--r--Misc/NEWS3
3 files changed, 7 insertions, 4 deletions
diff --git a/Doc/library/audioop.rst b/Doc/library/audioop.rst
index 51391ef..c947608 100644
--- a/Doc/library/audioop.rst
+++ b/Doc/library/audioop.rst
@@ -7,7 +7,7 @@
The :mod:`audioop` module contains some useful operations on sound fragments.
It operates on sound fragments consisting of signed integer samples 8, 16 or 32
-bits wide, stored in Python strings. All scalar items are integers, unless
+bits wide, stored in bytes objects. All scalar items are integers, unless
specified otherwise.
.. index::
@@ -126,7 +126,7 @@ The module defines the following variables and functions:
.. function:: lin2alaw(fragment, width)
Convert samples in the audio fragment to a-LAW encoding and return this as a
- Python string. a-LAW is an audio encoding format whereby you get a dynamic
+ bytes object. a-LAW is an audio encoding format whereby you get a dynamic
range of about 13 bits using only 8 bit samples. It is used by the Sun audio
hardware, among others.
@@ -151,7 +151,7 @@ The module defines the following variables and functions:
.. function:: lin2ulaw(fragment, width)
Convert samples in the audio fragment to u-LAW encoding and return this as a
- Python string. u-LAW is an audio encoding format whereby you get a dynamic
+ bytes object. u-LAW is an audio encoding format whereby you get a dynamic
range of about 14 bits using only 8 bit samples. It is used by the Sun audio
hardware, among others.
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index a153878..3397415 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -1621,7 +1621,7 @@ class IndentSearcher(object):
tokens = _tokenize.generate_tokens(self.readline)
for token in tokens:
self.tokeneater(*token)
- except _tokenize.TokenError:
+ except (_tokenize.TokenError, SyntaxError):
# since we cut off the tokenizer early, we can trigger
# spurious errors
pass
diff --git a/Misc/NEWS b/Misc/NEWS
index a50be3d..821e4b4 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -121,6 +121,9 @@ Core and Builtins
Library
-------
+- Issue #16504: IDLE now catches SyntaxErrors raised by tokenizer. Patch by
+ Roger Serwy.
+
- Issue #16618: Make glob.glob match consistently across strings and bytes
regarding leading dots. Patch by Serhiy Storchaka.