Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e7ba495

Browse files
gvanrossumgvanrossum
committed
Merged revisions 55631-55794 via svnmerge from
svn+ssh://[email protected]/python/branches/p3yk ................ r55636 | neal.norwitz | 2007-05-29 00:06:39 -0700 (Tue, 29 May 2007) | 149 lines Merged revisions 55506-55635 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r55507 | georg.brandl | 2007-05-22 07:28:17 -0700 (Tue, 22 May 2007) | 2 lines Remove the "panel" module doc file which has been ignored since 1994. ........ r55522 | mark.hammond | 2007-05-22 19:04:28 -0700 (Tue, 22 May 2007) | 4 lines Remove definition of PY_UNICODE_TYPE from pyconfig.h, allowing the definition in unicodeobject.h to be used, giving us the desired wchar_t in place of 'unsigned short'. As discussed on python-dev. ........ r55525 | neal.norwitz | 2007-05-22 23:35:32 -0700 (Tue, 22 May 2007) | 6 lines Add -3 option to the interpreter to warn about features that are deprecated and will be changed/removed in Python 3.0. This patch is mostly from Anthony. I tweaked some format and added a little doc. ........ r55527 | neal.norwitz | 2007-05-22 23:57:35 -0700 (Tue, 22 May 2007) | 1 line Whitespace cleanup ........ r55528 | neal.norwitz | 2007-05-22 23:58:36 -0700 (Tue, 22 May 2007) | 1 line Add a bunch more deprecation warnings for builtins that are going away in 3.0 ........ r55549 | georg.brandl | 2007-05-24 09:49:29 -0700 (Thu, 24 May 2007) | 2 lines shlex.split() now has an optional "posix" parameter. ........ r55550 | georg.brandl | 2007-05-24 10:33:33 -0700 (Thu, 24 May 2007) | 2 lines Fix parameter passing. ........ r55555 | facundo.batista | 2007-05-24 10:50:54 -0700 (Thu, 24 May 2007) | 6 lines Added an optional timeout parameter to urllib.ftpwrapper, with tests (for this and a basic one, because there weren't any). Changed also NEWS, but didn't find documentation for this function, assumed it wasn't public... ........ r55563 | facundo.batista | 2007-05-24 13:01:59 -0700 (Thu, 24 May 2007) | 4 lines Removed the .recv() in the test, is not necessary, and was causing problems that didn't have anything to do with was actually being tested... ........ r55564 | facundo.batista | 2007-05-24 13:51:19 -0700 (Thu, 24 May 2007) | 5 lines Let's see if reading exactly what is written allow this live test to pass (now I know why there were so few tests in ftp, http, etc, :( ). ........ r55567 | facundo.batista | 2007-05-24 20:10:28 -0700 (Thu, 24 May 2007) | 4 lines Trying to make the tests work in Windows and Solaris, everywhere else just works ........ r55568 | facundo.batista | 2007-05-24 20:47:19 -0700 (Thu, 24 May 2007) | 4 lines Fixing stupid error, and introducing a sleep, to see if the other thread is awakened and finish sending data. ........ r55569 | facundo.batista | 2007-05-24 21:20:22 -0700 (Thu, 24 May 2007) | 4 lines Commenting out the tests until find out who can test them in one of the problematic enviroments. ........ r55570 | neal.norwitz | 2007-05-24 22:13:40 -0700 (Thu, 24 May 2007) | 2 lines Get test passing again by commenting out the reference to the test class. ........ r55575 | vinay.sajip | 2007-05-25 00:05:59 -0700 (Fri, 25 May 2007) | 1 line Updated docstring for SysLogHandler (#1720726). ........ r55576 | vinay.sajip | 2007-05-25 00:06:55 -0700 (Fri, 25 May 2007) | 1 line Updated documentation for SysLogHandler (#1720726). ........ r55592 | brett.cannon | 2007-05-25 13:17:15 -0700 (Fri, 25 May 2007) | 3 lines Remove direct call's to file's constructor and replace them with calls to open() as ths is considered best practice. ........ r55601 | kristjan.jonsson | 2007-05-26 12:19:50 -0700 (Sat, 26 May 2007) | 1 line Remove the rgbimgmodule from PCBuild8 ........ r55602 | kristjan.jonsson | 2007-05-26 12:31:39 -0700 (Sat, 26 May 2007) | 1 line Include <windows.h> after python.h, so that WINNT is properly set before windows.h is included. Fixes warnings in PC builds. ........ r55603 | walter.doerwald | 2007-05-26 14:04:13 -0700 (Sat, 26 May 2007) | 2 lines Fix typo. ........ r55604 | peter.astrand | 2007-05-26 15:18:20 -0700 (Sat, 26 May 2007) | 1 line Applied patch 1669481, slightly modified: Support close_fds on Win32 ........ r55606 | neal.norwitz | 2007-05-26 21:08:54 -0700 (Sat, 26 May 2007) | 2 lines Add the new function object attribute names from py3k. ........ r55617 | lars.gustaebel | 2007-05-27 12:49:30 -0700 (Sun, 27 May 2007) | 20 lines Added errors argument to TarFile class that allows the user to specify an error handling scheme for character conversion. Additional scheme "utf-8" in read mode. Unicode input filenames are now supported by design. The values of the pax_headers dictionary are now limited to unicode objects. Fixed: The prefix field is no longer used in PAX_FORMAT (in conformance with POSIX). Fixed: In read mode use a possible pax header size field. Fixed: Strip trailing slashes from pax header name values. Fixed: Give values in user-specified pax_headers precedence when writing. Added unicode tests. Added pax/regtype4 member to testtar.tar all possible number fields in a pax header. Added two chapters to the documentation about the different formats tarfile.py supports and how unicode issues are handled. ........ r55618 | raymond.hettinger | 2007-05-27 22:23:22 -0700 (Sun, 27 May 2007) | 1 line Explain when groupby() issues a new group. ........ r55634 | martin.v.loewis | 2007-05-28 21:01:29 -0700 (Mon, 28 May 2007) | 2 lines Test pre-commit hook for a link to a .py file. ........ r55635 | martin.v.loewis | 2007-05-28 21:02:03 -0700 (Mon, 28 May 2007) | 2 lines Revert 55634. ........ ................ r55639 | neal.norwitz | 2007-05-29 00:58:11 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_{type,exc_value,exc_traceback} ................ r55641 | neal.norwitz | 2007-05-29 01:03:50 -0700 (Tue, 29 May 2007) | 1 line Missed one sys.exc_type. I wonder why exc_{value,traceback} were already gone ................ r55642 | neal.norwitz | 2007-05-29 01:08:33 -0700 (Tue, 29 May 2007) | 1 line Missed more doc for sys.exc_* attrs. ................ r55643 | neal.norwitz | 2007-05-29 01:18:19 -0700 (Tue, 29 May 2007) | 1 line Remove sys.exc_clear() ................ r55665 | guido.van.rossum | 2007-05-29 19:45:43 -0700 (Tue, 29 May 2007) | 4 lines Make None, True, False keywords. We can now also delete all the other places that explicitly forbid assignment to None, but I'm not going to bother right now. ................ r55666 | guido.van.rossum | 2007-05-29 20:01:51 -0700 (Tue, 29 May 2007) | 3 lines Found another place that needs check for forbidden names. Fixed test_syntax.py accordingly (it helped me find that one). ................ r55668 | guido.van.rossum | 2007-05-29 20:41:48 -0700 (Tue, 29 May 2007) | 2 lines Mark None, True, False as keywords. ................ r55673 | neal.norwitz | 2007-05-29 23:28:25 -0700 (Tue, 29 May 2007) | 3 lines Get the dis module working on modules again after changing dicts to not return lists and also new-style classes. Add a test. ................ r55674 | neal.norwitz | 2007-05-29 23:35:45 -0700 (Tue, 29 May 2007) | 1 line Umm, it helps to add the module that the test uses ................ r55675 | neal.norwitz | 2007-05-29 23:53:05 -0700 (Tue, 29 May 2007) | 4 lines Try to fix up all the other places that were assigning to True/False. There's at least one more problem in test.test_xmlrpc. I have other changes in that file and that should be fixed soon (I hope). ................ r55679 | neal.norwitz | 2007-05-30 00:31:55 -0700 (Wed, 30 May 2007) | 1 line Fix up another place that was assigning to True/False. ................ r55688 | brett.cannon | 2007-05-30 14:19:47 -0700 (Wed, 30 May 2007) | 2 lines Ditch MimeWriter. ................ r55692 | brett.cannon | 2007-05-30 14:52:00 -0700 (Wed, 30 May 2007) | 2 lines Remove the mimify module. ................ r55707 | guido.van.rossum | 2007-05-31 05:08:45 -0700 (Thu, 31 May 2007) | 2 lines Backport the addition of show_code() to dis.py -- it's too handy. ................ r55708 | guido.van.rossum | 2007-05-31 06:22:57 -0700 (Thu, 31 May 2007) | 7 lines Fix a fairly long-standing bug in the check for assignment to None (and other keywords, these days). In 2.5, you could write foo(None=1) without getting a SyntaxError (although foo()'s definition would have to use **kwds to avoid getting a runtime error complaining about an unknown keyword of course). This ought to be backported to 2.5.2 or at least 2.6. ................ r55724 | brett.cannon | 2007-05-31 19:32:41 -0700 (Thu, 31 May 2007) | 2 lines Remove the cfmfile. ................ r55727 | neal.norwitz | 2007-05-31 22:19:44 -0700 (Thu, 31 May 2007) | 1 line Remove reload() builtin. ................ r55729 | neal.norwitz | 2007-05-31 22:51:30 -0700 (Thu, 31 May 2007) | 59 lines Merged revisions 55636-55728 via svnmerge from svn+ssh://[email protected]/python/trunk ........ r55637 | georg.brandl | 2007-05-29 00:16:47 -0700 (Tue, 29 May 2007) | 2 lines Fix rst markup. ........ r55638 | neal.norwitz | 2007-05-29 00:51:39 -0700 (Tue, 29 May 2007) | 1 line Fix typo in doc ........ r55671 | neal.norwitz | 2007-05-29 21:53:41 -0700 (Tue, 29 May 2007) | 1 line Fix indentation (whitespace only). ........ r55676 | thomas.heller | 2007-05-29 23:58:30 -0700 (Tue, 29 May 2007) | 1 line Fix compiler warnings. ........ r55677 | thomas.heller | 2007-05-30 00:01:25 -0700 (Wed, 30 May 2007) | 2 lines Correct the name of a field in the WIN32_FIND_DATAA and WIN32_FIND_DATAW structures. Closes bug #1726026. ........ r55686 | brett.cannon | 2007-05-30 13:46:26 -0700 (Wed, 30 May 2007) | 2 lines Have MimeWriter raise a DeprecationWarning as per PEP 4 and its documentation. ........ r55690 | brett.cannon | 2007-05-30 14:48:58 -0700 (Wed, 30 May 2007) | 3 lines Have mimify raise a DeprecationWarning. The docs and PEP 4 have listed the module as deprecated for a while. ........ r55696 | brett.cannon | 2007-05-30 15:24:28 -0700 (Wed, 30 May 2007) | 2 lines Have md5 raise a DeprecationWarning as per PEP 4. ........ r55705 | neal.norwitz | 2007-05-30 21:14:22 -0700 (Wed, 30 May 2007) | 1 line Add some spaces in the example code. ........ r55716 | brett.cannon | 2007-05-31 12:20:00 -0700 (Thu, 31 May 2007) | 2 lines Have the sha module raise a DeprecationWarning as specified in PEP 4. ........ r55719 | brett.cannon | 2007-05-31 12:40:42 -0700 (Thu, 31 May 2007) | 2 lines Cause buildtools to raise a DeprecationWarning. ........ r55721 | brett.cannon | 2007-05-31 13:01:11 -0700 (Thu, 31 May 2007) | 2 lines Have cfmfile raise a DeprecationWarning as per PEP 4. ........ r55726 | neal.norwitz | 2007-05-31 21:56:47 -0700 (Thu, 31 May 2007) | 1 line Mail if there is an installation failure. ........ ................ r55730 | neal.norwitz | 2007-05-31 23:22:07 -0700 (Thu, 31 May 2007) | 2 lines Remove the code that was missed in rev 55303. ................ r55738 | neal.norwitz | 2007-06-01 19:10:43 -0700 (Fri, 01 Jun 2007) | 1 line Fix doc breakage ................ r55741 | neal.norwitz | 2007-06-02 00:41:58 -0700 (Sat, 02 Jun 2007) | 1 line Remove timing module (plus some remnants of other modules). ................ r55742 | neal.norwitz | 2007-06-02 00:51:44 -0700 (Sat, 02 Jun 2007) | 1 line Remove posixfile module (plus some remnants of other modules). ................ r55744 | neal.norwitz | 2007-06-02 10:18:56 -0700 (Sat, 02 Jun 2007) | 1 line Fix doc breakage. ................ r55745 | neal.norwitz | 2007-06-02 11:32:16 -0700 (Sat, 02 Jun 2007) | 1 line Make a whatsnew 3.0 template. ................ r55754 | neal.norwitz | 2007-06-03 23:24:18 -0700 (Sun, 03 Jun 2007) | 1 line SF #1730441, os._execvpe raises UnboundLocal due to new try/except semantics ................ r55755 | neal.norwitz | 2007-06-03 23:26:00 -0700 (Sun, 03 Jun 2007) | 1 line Get rid of extra whitespace ................ r55794 | guido.van.rossum | 2007-06-06 15:29:22 -0700 (Wed, 06 Jun 2007) | 3 lines Make this compile in GCC 2.96, which does not allow interspersing declarations and code. ................
1 parent 0e41148 commit e7ba495

116 files changed

Lines changed: 1005 additions & 4655 deletions

File tree

Some content is hidden

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

‎Demo/imputil/knee.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,7 @@ def import_module(partname, fqname, parent):
106106
return m
107107

108108

109-
# Replacement for reload()
110-
def reload_hook(module):
109+
def reload(module):
111110
name = module.__name__
112111
if '.' not in name:
113112
return import_module(name, name, None)
@@ -119,8 +118,6 @@ def reload_hook(module):
119118

120119
# Save the original hooks
121120
original_import = __builtin__.__import__
122-
original_reload = __builtin__.reload
123121

124122
# Now install our hooks
125123
__builtin__.__import__ = import_hook
126-
__builtin__.reload = reload_hook

‎Demo/pdist/cvslock.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,6 @@ def test():
262262
rl.unlock()
263263
finally:
264264
print [1]
265-
sys.exc_traceback = None
266265
print [2]
267266
if rl:
268267
rl.unlock()

‎Doc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ EMACS= emacs
122122

123123
# The end of this should reflect the major/minor version numbers of
124124
# the release:
125-
WHATSNEW=whatsnew26
125+
WHATSNEW=whatsnew30
126126

127127
# what's what
128128
MANDVIFILES= paper-$(PAPER)/api.dvi paper-$(PAPER)/ext.dvi \

‎Doc/Makefile.deps‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
171171
lib/libgdbm.tex \
172172
lib/libtermios.tex \
173173
lib/libfcntl.tex \
174-
lib/libposixfile.tex \
175174
lib/libsyslog.tex \
176175
lib/liblogging.tex \
177176
lib/libpdb.tex \
@@ -192,7 +191,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
192191
lib/libsgmllib.tex \
193192
lib/librfc822.tex \
194193
lib/libmimetools.tex \
195-
lib/libmimewriter.tex \
196194
lib/libbinascii.tex \
197195
lib/libmm.tex \
198196
lib/libaudioop.tex \
@@ -235,7 +233,6 @@ LIBFILES= $(MANSTYLES) $(INDEXSTYLES) $(COMMONTEX) \
235233
lib/libzipfile.tex \
236234
lib/libpprint.tex \
237235
lib/libcode.tex \
238-
lib/libmimify.tex \
239236
lib/libre.tex \
240237
lib/libuserdict.tex \
241238
lib/libdis.tex \

‎Doc/api/utilities.tex‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,7 @@ \section{Importing Modules \label{importing}}
140140
\end{cfuncdesc}
141141

142142
\begin{cfuncdesc}{PyObject*}{PyImport_ReloadModule}{PyObject *m}
143-
Reload a module. This is best described by referring to the
144-
built-in Python function \function{reload()}\bifuncindex{reload}, as
145-
the standard \function{reload()} function calls this function
146-
directly. Return a new reference to the reloaded module, or \NULL{}
143+
Reload a module. Return a new reference to the reloaded module, or \NULL{}
147144
with an exception set on failure (the module still exists in this
148145
case).
149146
\end{cfuncdesc}

‎Doc/ext/extending.tex‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,7 @@ \section{The Module's Method Table and Initialization Function
399399
following a \cfunction{fork()} without an intervening
400400
\cfunction{exec()}) can create problems for some extension modules.
401401
Extension module authors should exercise caution when initializing
402-
internal data structures.
403-
Note also that the \function{reload()} function can be used with
404-
extension modules, and will call the module initialization function
405-
(\cfunction{initspam()} in the example), but will not load the module
406-
again if it was loaded from a dynamically loadable object file
407-
(\file{.so} on \UNIX, \file{.dll} on Windows).}
402+
internal data structures.}
408403

409404
A more substantial example module is included in the Python source
410405
distribution as \file{Modules/xxmodule.c}. This file may be used as a

‎Doc/howto/functional.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,7 @@ element.
980980
that's a slice of the iterator. With a single ``stop`` argument,
981981
it will return the first ``stop``
982982
elements. If you supply a starting index, you'll get ``stop-start``
983-
elements, and if you supply a value for ``step`, elements will be
983+
elements, and if you supply a value for ``step``, elements will be
984984
skipped accordingly. Unlike Python's string and list slicing, you
985985
can't use negative values for ``start``, ``stop``, or ``step``.
986986

‎Doc/lib/lib.tex‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ \chapter*{Front Matter\label{front}}
146146
\input{libmhlib}
147147
\input{libmimetools}
148148
\input{libmimetypes}
149-
\input{libmimewriter}
150-
\input{libmimify}
151149
\input{libmultifile}
152150
\input{librfc822}
153151

@@ -265,7 +263,6 @@ \chapter*{Front Matter\label{front}}
265263
\input{libpty}
266264
\input{libfcntl}
267265
\input{libpipes}
268-
\input{libposixfile}
269266
\input{libresource}
270267
\input{libnis}
271268
\input{libsyslog}

‎Doc/lib/libcodecs.tex‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ \section{\module{codecs} ---
237237
\begin{funcdesc}{iterdecode}{iterable, encoding\optional{, errors}}
238238
Uses an incremental decoder to iteratively decode the input provided by
239239
\var{iterable}. This function is a generator. \var{errors} (as well as
240-
any other keyword argument) is passed through to the incremental encoder.
240+
any other keyword argument) is passed through to the incremental decoder.
241241
\versionadded{2.5}
242242
\end{funcdesc}
243243

‎Doc/lib/libfuncs.tex‎

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -890,82 +890,6 @@ \section{Built-in Functions \label{built-in-funcs}}
890890
\end{verbatim}
891891
\end{funcdesc}
892892

893-
\begin{funcdesc}{reload}{module}
894-
Reload a previously imported \var{module}. The
895-
argument must be a module object, so it must have been successfully
896-
imported before. This is useful if you have edited the module
897-
source file using an external editor and want to try out the new
898-
version without leaving the Python interpreter. The return value is
899-
the module object (the same as the \var{module} argument).
900-
901-
When \code{reload(module)} is executed:
902-
903-
\begin{itemize}
904-
905-
\item Python modules' code is recompiled and the module-level code
906-
reexecuted, defining a new set of objects which are bound to names in
907-
the module's dictionary. The \code{init} function of extension
908-
modules is not called a second time.
909-
910-
\item As with all other objects in Python the old objects are only
911-
reclaimed after their reference counts drop to zero.
912-
913-
\item The names in the module namespace are updated to point to
914-
any new or changed objects.
915-
916-
\item Other references to the old objects (such as names external
917-
to the module) are not rebound to refer to the new objects and
918-
must be updated in each namespace where they occur if that is
919-
desired.
920-
921-
\end{itemize}
922-
923-
There are a number of other caveats:
924-
925-
If a module is syntactically correct but its initialization fails,
926-
the first \keyword{import} statement for it does not bind its name
927-
locally, but does store a (partially initialized) module object in
928-
\code{sys.modules}. To reload the module you must first
929-
\keyword{import} it again (this will bind the name to the partially
930-
initialized module object) before you can \function{reload()} it.
931-
932-
When a module is reloaded, its dictionary (containing the module's
933-
global variables) is retained. Redefinitions of names will override
934-
the old definitions, so this is generally not a problem. If the new
935-
version of a module does not define a name that was defined by the
936-
old version, the old definition remains. This feature can be used
937-
to the module's advantage if it maintains a global table or cache of
938-
objects --- with a \keyword{try} statement it can test for the
939-
table's presence and skip its initialization if desired:
940-
941-
\begin{verbatim}
942-
try:
943-
cache
944-
except NameError:
945-
cache = {}
946-
\end{verbatim}
947-
948-
949-
It is legal though generally not very useful to reload built-in or
950-
dynamically loaded modules, except for \refmodule{sys},
951-
\refmodule[main]{__main__} and \refmodule[builtin]{__builtin__}. In
952-
many cases, however, extension modules are not designed to be
953-
initialized more than once, and may fail in arbitrary ways when
954-
reloaded.
955-
956-
If a module imports objects from another module using \keyword{from}
957-
\ldots{} \keyword{import} \ldots{}, calling \function{reload()} for
958-
the other module does not redefine the objects imported from it ---
959-
one way around this is to re-execute the \keyword{from} statement,
960-
another is to use \keyword{import} and qualified names
961-
(\var{module}.\var{name}) instead.
962-
963-
If a module instantiates instances of a class, reloading the module
964-
that defines the class does not affect the method definitions of the
965-
instances --- they continue to use the old class definition. The
966-
same is true for derived classes.
967-
\end{funcdesc}
968-
969893
\begin{funcdesc}{repr}{object}
970894
Return a string containing a printable representation of an object.
971895
This is the same value yielded by conversions (reverse quotes).

0 commit comments

Comments
 (0)