Skip to content

Commit 33d2689

Browse files
gvanrossumgvanrossum
committed
Merged revisions 56492-56752 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r56497 | kurt.kaiser | 2007-07-22 14:55:16 -0700 (Sun, 22 Jul 2007) | 4 lines In the case of syntax errors, in py3k format_exception_only() was including line number and position in the final line of the exception notification, duplicating info in previous lines. ........ r56501 | kurt.kaiser | 2007-07-22 19:35:50 -0700 (Sun, 22 Jul 2007) | 2 lines Hum, needed a newline in the last change. ........ r56536 | kurt.kaiser | 2007-07-24 19:06:48 -0700 (Tue, 24 Jul 2007) | 5 lines Not all instantiations of SyntaxError set the args attribute. e.g. symtable.c Modify format_exception_only() to get SyntaxError attributes directly instead of unpacking 'args'. ........ r56537 | kurt.kaiser | 2007-07-24 19:13:03 -0700 (Tue, 24 Jul 2007) | 3 lines Update doctest strings: traceback.py no longer prints redundant location information in the last line of the exception display. ........ r56627 | kurt.kaiser | 2007-07-29 21:06:57 -0700 (Sun, 29 Jul 2007) | 2 lines Interactive interpreter emulator (code.py) failing to print exceptions. ........ r56628 | kurt.kaiser | 2007-07-29 21:41:02 -0700 (Sun, 29 Jul 2007) | 2 lines Eliminate extra lines before and after tracebacks. ........ r56638 | kurt.kaiser | 2007-07-31 19:36:45 -0700 (Tue, 31 Jul 2007) | 3 lines Refactor syntax error display in shell and edit windows; move colorize_syntax_error() to EditorWindow; update to py3k. ........ r56685 | neal.norwitz | 2007-08-02 22:20:23 -0700 (Thu, 02 Aug 2007) | 10 lines Remove several h/w and o/s specific modules that are undocumented, obsolete, and/or not widely used: linuxaudiodev.c, sunaudiodev.c Lib/plat-sunos5/SUNAUDIODEV.py Lib/audiodev.py Tools/audiopy/audiopy Move Lib/toaiff.py to Demo. See PEP 3108 for most of the details. ........ r56686 | neal.norwitz | 2007-08-02 22:21:48 -0700 (Thu, 02 Aug 2007) | 4 lines Missed one module that should have been removed since it relied on audiodev which was removed. ........ r56748 | neal.norwitz | 2007-08-04 19:19:04 -0700 (Sat, 04 Aug 2007) | 1 line Make from X import * outside module scope an error. ........ r56750 | neal.norwitz | 2007-08-04 19:35:01 -0700 (Sat, 04 Aug 2007) | 1 line Use READONLY consistently instead of RO ........
1 parent 77553ab commit 33d2689

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+155
-2776
lines changed

‎Demo/scripts/morse.py‎

Lines changed: 0 additions & 149 deletions
This file was deleted.

Lib/toaiff.py renamed to Demo/scripts/toaiff.py

File renamed without changes.

‎Doc/Makefile.deps‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
199199
lib/libcrypto.tex \
200200
lib/libhashlib.tex \
201201
lib/libhmac.tex \
202-
lib/libsun.tex \
203202
lib/libxdrlib.tex \
204203
lib/libimghdr.tex \
205204
lib/libformatter.tex \
@@ -259,7 +258,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
259258
lib/libsymbol.tex \
260259
lib/libbinhex.tex \
261260
lib/libuu.tex \
262-
lib/libsunaudio.tex \
263261
lib/libfileinput.tex \
264262
lib/libimaplib.tex \
265263
lib/libpoplib.tex \

‎Doc/lib/lib.tex‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,6 @@ \chapter*{Front Matter\label{front}}
416416
% OTHER PLATFORM-SPECIFIC STUFF
417417
% =============
418418

419-
\input{libsun} % SUNOS ONLY
420-
\input{libsunaudio}
421-
% XXX(nnorwitz): the modules below this comment should be kept.
422-
423419
\input{windows} % MS Windows ONLY
424420
\input{libmsilib}
425421
\input{libmsvcrt}
@@ -430,9 +426,6 @@ \chapter*{Front Matter\label{front}}
430426
\input{libundoc}
431427

432428
%\chapter{Obsolete Modules}
433-
%\input{libcmpcache}
434-
%\input{libcmp}
435-
%\input{libni}
436429

437430
\chapter{Reporting Bugs}
438431
\input{reportingbugs}

‎Doc/lib/libaudioop.tex‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ \section{\module{audioop} ---
77

88
The \module{audioop} module contains some useful operations on sound
99
fragments. It operates on sound fragments consisting of signed
10-
integer samples 8, 16 or 32 bits wide, stored in Python strings. This
11-
is the same format as used by the \refmodule{al} and \refmodule{sunaudiodev}
12-
modules. All scalar items are integers, unless specified otherwise.
10+
integer samples 8, 16 or 32 bits wide, stored in Python strings.
11+
All scalar items are integers, unless specified otherwise.
1312

1413
% This para is mostly here to provide an excuse for the index entries...
1514
This module provides support for a-LAW, u-LAW and Intel/DVI ADPCM encodings.

‎Doc/lib/libsun.tex‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Doc/lib/libsunaudio.tex‎

Lines changed: 0 additions & 146 deletions
This file was deleted.

‎Doc/lib/libundoc.tex‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,8 @@ \section{Platform specific modules}
5252
\section{Multimedia}
5353

5454
\begin{description}
55-
\item[\module{audiodev}]
56-
--- Platform-independent API for playing audio data.
57-
58-
\item[\module{linuxaudiodev}]
59-
--- Play audio data on the Linux audio device. Replaced in Python 2.3
60-
by the \module{ossaudiodev} module.
61-
6255
\item[\module{sunaudio}]
6356
--- Interpret Sun audio headers (may become obsolete or a tool/demo).
64-
65-
\item[\module{toaiff}]
66-
--- Convert "arbitrary" sound files to AIFF files; should probably
67-
become a tool or demo. Requires the external program \program{sox}.
6857
\end{description}
6958

7059

0 commit comments

Comments
 (0)