Mailman 3 April 2004 - Python-checkins

python/dist/src/Lib optparse.py,1.7,1.8
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13332/Lib Modified Files: optparse.py Log Message: Fix support for the "prog" keyword to the OptionParser constructor, as well as directly setting the .prog attribute (which should be supported based on the class docstring). Closes SF bug #850964. Index: optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/optparse.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** optparse.py 21 Mar 2004 19:28:48 -0000 1.7 --- optparse.py 1 Apr 2004 07:40:35 -0000 1.8 *************** *** 1026,1029 **** --- 1026,1034 ---- self.values = None + def _get_prog_name(self): + if self.prog: + return self.prog + else: + return get_prog_name() # -- Simple modifier methods --------------------------------------- *************** *** 1289,1298 **** """ self.print_usage(sys.stderr) ! sys.exit("%s: error: %s" % (get_prog_name(), msg)) def get_usage (self): if self.usage: return self.formatter.format_usage( ! self.usage.replace("%prog", get_prog_name())) else: return "" --- 1294,1303 ---- """ self.print_usage(sys.stderr) ! sys.exit("%s: error: %s" % (self._get_prog_name(), msg)) def get_usage (self): if self.usage: return self.formatter.format_usage( ! self.usage.replace("%prog", self._get_prog_name())) else: return "" *************** *** 1312,1316 **** def get_version (self): if self.version: ! return self.version.replace("%prog", get_prog_name()) else: return "" --- 1317,1321 ---- def get_version (self): if self.version: ! return self.version.replace("%prog", self._get_prog_name()) else: return ""

1 0

python/dist/src/Lib/test test_optparse.py, 1.2, 1.3
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13332/Lib/test Modified Files: test_optparse.py Log Message: Fix support for the "prog" keyword to the OptionParser constructor, as well as directly setting the .prog attribute (which should be supported based on the class docstring). Closes SF bug #850964. Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** test_optparse.py 1 May 2003 17:45:38 -0000 1.2 --- test_optparse.py 1 Apr 2004 07:40:35 -0000 1.3 *************** *** 613,616 **** --- 613,632 ---- sys.argv[0] = oldargv + def test_version_with_prog_keyword(self): + oldargv = sys.argv[0] + sys.argv[0] = "./foo/bar" + self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1", + prog="splat") + self.assertStdoutEquals(["--version"], "splat 0.1\n") + sys.argv[0] = oldargv + + def test_version_with_prog_attribute(self): + oldargv = sys.argv[0] + sys.argv[0] = "./foo/bar" + self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1") + self.parser.prog = "splat" + self.assertStdoutEquals(["--version"], "splat 0.1\n") + sys.argv[0] = oldargv + def test_no_version(self): self.parser = OptionParser(usage=SUPPRESS_USAGE)

1 0

[Python-checkins] python/dist/src/Lib/test test_optparse.py, 1.2.8.1, 1.2.8.2
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12994/Lib/test Modified Files: Tag: release23-maint test_optparse.py Log Message: Fix support for the "prog" keyword to the OptionParser constructor, as well as directly setting the .prog attribute (which should be supported based on the class docstring). Closes SF bug #850964. Index: test_optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_optparse.py,v retrieving revision 1.2.8.1 retrieving revision 1.2.8.2 diff -C2 -d -r1.2.8.1 -r1.2.8.2 *** test_optparse.py 4 Aug 2003 22:49:42 -0000 1.2.8.1 --- test_optparse.py 1 Apr 2004 07:38:49 -0000 1.2.8.2 *************** *** 613,616 **** --- 613,632 ---- sys.argv[0] = oldargv + def test_version_with_prog_keyword(self): + oldargv = sys.argv[0] + sys.argv[0] = "./foo/bar" + self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1", + prog="splat") + self.assertStdoutEquals(["--version"], "splat 0.1\n") + sys.argv[0] = oldargv + + def test_version_with_prog_attribute(self): + oldargv = sys.argv[0] + sys.argv[0] = "./foo/bar" + self.parser = OptionParser(usage=SUPPRESS_USAGE, version="%prog 0.1") + self.parser.prog = "splat" + self.assertStdoutEquals(["--version"], "splat 0.1\n") + sys.argv[0] = oldargv + def test_no_version(self): self.parser = OptionParser(usage=SUPPRESS_USAGE)

1 0

python/dist/src/Lib optparse.py,1.5.8.1,1.5.8.2
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12994/Lib Modified Files: Tag: release23-maint optparse.py Log Message: Fix support for the "prog" keyword to the OptionParser constructor, as well as directly setting the .prog attribute (which should be supported based on the class docstring). Closes SF bug #850964. Index: optparse.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/optparse.py,v retrieving revision 1.5.8.1 retrieving revision 1.5.8.2 diff -C2 -d -r1.5.8.1 -r1.5.8.2 *** optparse.py 26 Jan 2004 18:40:49 -0000 1.5.8.1 --- optparse.py 1 Apr 2004 07:38:49 -0000 1.5.8.2 *************** *** 1026,1029 **** --- 1026,1034 ---- self.values = None + def _get_prog_name(self): + if self.prog: + return self.prog + else: + return get_prog_name() # -- Simple modifier methods --------------------------------------- *************** *** 1289,1298 **** """ self.print_usage(sys.stderr) ! sys.exit("%s: error: %s" % (get_prog_name(), msg)) def get_usage (self): if self.usage: return self.formatter.format_usage( ! self.usage.replace("%prog", get_prog_name())) else: return "" --- 1294,1303 ---- """ self.print_usage(sys.stderr) ! sys.exit("%s: error: %s" % (self._get_prog_name(), msg)) def get_usage (self): if self.usage: return self.formatter.format_usage( ! self.usage.replace("%prog", self._get_prog_name())) else: return "" *************** *** 1312,1316 **** def get_version (self): if self.version: ! return self.version.replace("%prog", get_prog_name()) else: return "" --- 1317,1321 ---- def get_version (self): if self.version: ! return self.version.replace("%prog", self._get_prog_name()) else: return ""

1 0

python/dist/src/Doc/perl python.perl, 1.137.8.1, 1.137.8.2
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Doc/perl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17255 Modified Files: Tag: release23-maint python.perl Log Message: backport trunk revision 1.144, closing SF bug #793702: - make "--" in code text not get converted to "-" - fix minor typo in comment (but this time the typo is fixed correctly!) Index: python.perl =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/perl/python.perl,v retrieving revision 1.137.8.1 retrieving revision 1.137.8.2 diff -C2 -d -r1.137.8.1 -r1.137.8.2 *** python.perl 8 Jan 2004 15:00:13 -0000 1.137.8.1 --- python.perl 1 Apr 2004 04:33:39 -0000 1.137.8.2 *************** *** 156,159 **** --- 156,167 ---- } + # Helper used in many places that arbitrary code-like text appears: + + sub codetext($){ + my $text = "$_[0]"; + $text =~ s/--/-\-/go; + return $text; + } + sub use_wrappers($$$){ local($_,$before,$after) = @_; *************** *** 162,165 **** --- 170,179 ---- } + sub use_code_wrappers($$$){ + local($_,$before,$after) = @_; + my $stuff = codetext(next_argument()); + return $before . $stuff . $after . $_; + } + $IN_DESC_HANDLER = 0; sub do_cmd_optional{ *************** *** 182,186 **** return use_wrappers($_[0], '', ''); } sub do_cmd_code{ ! return use_wrappers($_[0], '<code>', '</code>'); } sub do_cmd_module{ return use_wrappers($_[0], '<tt class="module">', '</tt>'); } --- 196,200 ---- return use_wrappers($_[0], '', ''); } sub do_cmd_code{ ! return use_code_wrappers($_[0], '<code>', '</code>'); } sub do_cmd_module{ return use_wrappers($_[0], '<tt class="module">', '</tt>'); } *************** *** 206,212 **** return use_wrappers($_[0], '<tt class="ctype">', '</tt>'); } sub do_cmd_regexp{ ! return use_wrappers($_[0], '<tt class="regexp">', '</tt>'); } sub do_cmd_character{ ! return use_wrappers($_[0], '"<tt class="character">', '</tt>"'); } sub do_cmd_program{ return use_wrappers($_[0], '', ''); } --- 220,226 ---- return use_wrappers($_[0], '<tt class="ctype">', '</tt>'); } sub do_cmd_regexp{ ! return use_code_wrappers($_[0], '<tt class="regexp">', '</tt>'); } sub do_cmd_character{ ! return use_code_wrappers($_[0], '"<tt class="character">', '</tt>"'); } sub do_cmd_program{ return use_wrappers($_[0], '', ''); } *************** *** 233,237 **** return do_cmd_file($_[0]); } sub do_cmd_samp{ ! return use_wrappers($_[0], '"<tt class="samp">', '</tt>"'); } sub do_cmd_kbd{ return use_wrappers($_[0], '<kbd>', '</kbd>'); } --- 247,251 ---- return do_cmd_file($_[0]); } sub do_cmd_samp{ ! return use_code_wrappers($_[0], '"<tt class="samp">', '</tt>"'); } sub do_cmd_kbd{ return use_wrappers($_[0], '<kbd>', '</kbd>'); } *************** *** 612,616 **** define_indexing_macro('ttindex'); sub idx_cmd_ttindex($){ ! my $str = next_argument(); my $entry = $str . get_indexsubitem(); add_index_entry($entry, $_[0]); --- 626,630 ---- define_indexing_macro('ttindex'); sub idx_cmd_ttindex($){ ! my $str = codetext(next_argument()); my $entry = $str . get_indexsubitem(); add_index_entry($entry, $_[0]); *************** *** 2028,2035 **** }; $open_tags_R = [ @keep_open_tags ]; ! $_; } ! # List of all filenames produced ny do_cmd_verbatiminput() %VerbatimFiles = (); @VerbatimOutputs = (); --- 2042,2049 ---- }; $open_tags_R = [ @keep_open_tags ]; ! return codetext($_); } ! # List of all filenames produced by do_cmd_verbatiminput() %VerbatimFiles = (); @VerbatimOutputs = ();

1 0

python/dist/src/Doc/lib liburllib.tex, 1.50.8.1, 1.50.8.2
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13286 Modified Files: Tag: release23-maint liburllib.tex Log Message: Note that reading from a socket may not always return all of the remaining content of a stream when expected to do so. Closes SF bug #725265. Backported from trunk revision 1.52. Index: liburllib.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/liburllib.tex,v retrieving revision 1.50.8.1 retrieving revision 1.50.8.2 diff -C2 -d -r1.50.8.1 -r1.50.8.2 *** liburllib.tex 27 Aug 2003 15:10:54 -0000 1.50.8.1 --- liburllib.tex 1 Apr 2004 04:11:05 -0000 1.50.8.2 *************** *** 30,33 **** --- 30,37 ---- \method{close()}, \method{info()} and \method{geturl()}. It also has proper support for the iterator protocol. + One caveat: the \method{read()} method, if the size argument is + omitted or negative, may not read until the end of the data stream; + there is no good way to determine that the entire stream from a socket + has been read in the general case. Except for the \method{info()} and \method{geturl()} methods,

1 0

python/dist/src/Doc/lib xmldomminidom.tex, 1.8, 1.8.12.1
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12534 Modified Files: Tag: release23-maint xmldomminidom.tex Log Message: - make sure the methods minidom adds to the basic DOM are attributed to Node objects in the index (closes SF bug #832251) - fix a variety of markup nits Backported from trunk revision 1.9. Index: xmldomminidom.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/xmldomminidom.tex,v retrieving revision 1.8 retrieving revision 1.8.12.1 diff -C2 -d -r1.8 -r1.8.12.1 *** xmldomminidom.tex 18 Apr 2003 22:04:34 -0000 1.8 --- xmldomminidom.tex 1 Apr 2004 04:06:52 -0000 1.8.12.1 *************** *** 128,132 **** ! \begin{methoddesc}{unlink}{} Break internal references within the DOM so that it will be garbage collected on versions of Python without cyclic GC. Even when cyclic --- 128,132 ---- ! \begin{methoddesc}[Node]{unlink}{} Break internal references within the DOM so that it will be garbage collected on versions of Python without cyclic GC. Even when cyclic *************** *** 138,160 **** \end{methoddesc} ! \begin{methoddesc}{writexml}{writer} Write XML to the writer object. The writer should have a \method{write()} method which matches that of the file object interface. ! \versionadded[To support pretty output, new keyword parameters indent, ! addindent, and newl have been added]{2.1} ! \versionadded[For the \class{Document} node, an additional keyword argument encoding can be used to specify the encoding field of the XML header]{2.3} - \end{methoddesc} ! \begin{methoddesc}{toxml}{\optional{encoding}} Return the XML that the DOM represents as a string. - \versionadded[the \var{encoding} argument]{2.3} - With no argument, the XML header does not specify an encoding, and the result is Unicode string if the default encoding cannot represent all --- 138,157 ---- \end{methoddesc} ! \begin{methoddesc}[Node]{writexml}{writer} Write XML to the writer object. The writer should have a \method{write()} method which matches that of the file object interface. ! \versionchanged[To support pretty output, new keyword parameters ! \var{indent}, \var{addindent}, and \var{newl} have been added]{2.1} ! \versionchanged[For the \class{Document} node, an additional keyword argument encoding can be used to specify the encoding field of the XML header]{2.3} \end{methoddesc} ! \begin{methoddesc}[Node]{toxml}{\optional{encoding}} Return the XML that the DOM represents as a string. With no argument, the XML header does not specify an encoding, and the result is Unicode string if the default encoding cannot represent all *************** *** 169,176 **** as "utf-8". \end{methoddesc} ! \begin{methoddesc}{toprettyxml}{\optional{indent\optional{, newl}}} ! Return a pretty-printed version of the document. \var{indent} specifies the indentation string and defaults to a tabulator; \var{newl} specifies --- 166,173 ---- as "utf-8". + \versionchanged[the \var{encoding} argument was introduced]{2.3} \end{methoddesc} ! \begin{methoddesc}[Node]{toprettyxml}{\optional{indent\optional{, newl}}} Return a pretty-printed version of the document. \var{indent} specifies the indentation string and defaults to a tabulator; \var{newl} specifies *************** *** 178,184 **** \versionadded{2.1} ! ! \versionadded[the encoding argument; see \method{toxml}]{2.3} ! \end{methoddesc} --- 175,179 ---- \versionadded{2.1} ! \versionchanged[the encoding argument; see \method{toxml()}]{2.3} \end{methoddesc} *************** *** 186,190 **** \refmodule{xml.dom.minidom}: ! \begin{methoddesc}{cloneNode}{deep} Although this method was present in the version of \refmodule{xml.dom.minidom} packaged with Python 2.0, it was seriously --- 181,185 ---- \refmodule{xml.dom.minidom}: ! \begin{methoddesc}[Node]{cloneNode}{deep} Although this method was present in the version of \refmodule{xml.dom.minidom} packaged with Python 2.0, it was seriously

1 0

python/dist/src/Lib/distutils/command build_scripts.py, 1.21, 1.21.8.1 sdist.py, 1.56, 1.56.14.1
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Lib/distutils/command In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11059/Lib/distutils/command Modified Files: Tag: release23-maint build_scripts.py sdist.py Log Message: backport fix for SF bug #796042: sdist ignores scripts argument in setup The fix adds a get_source_files() method to the build_scripts command and adds the result to the default manifest list. Index: build_scripts.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/build_scripts.py,v retrieving revision 1.21 retrieving revision 1.21.8.1 diff -C2 -d -r1.21 -r1.21.8.1 *** build_scripts.py 27 Jun 2003 19:33:38 -0000 1.21 --- build_scripts.py 1 Apr 2004 03:56:46 -0000 1.21.8.1 *************** *** 42,45 **** --- 42,47 ---- self.scripts = self.distribution.scripts + def get_source_files(self): + return self.scripts def run (self): Index: sdist.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v retrieving revision 1.56 retrieving revision 1.56.14.1 diff -C2 -d -r1.56 -r1.56.14.1 *** sdist.py 19 Nov 2002 13:12:28 -0000 1.56 --- sdist.py 1 Apr 2004 03:56:46 -0000 1.56.14.1 *************** *** 305,308 **** --- 305,312 ---- self.filelist.extend(build_clib.get_source_files()) + if self.distribution.has_scripts(): + build_scripts = self.get_finalized_command('build_scripts') + self.filelist.extend(build_scripts.get_source_files()) + # add_defaults ()

1 0

python/dist/src/Doc/dist dist.tex, 1.56.8.4, 1.56.8.5
by fdrake＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Doc/dist In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11059/Doc/dist Modified Files: Tag: release23-maint dist.tex Log Message: backport fix for SF bug #796042: sdist ignores scripts argument in setup The fix adds a get_source_files() method to the build_scripts command and adds the result to the default manifest list. Index: dist.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/dist/dist.tex,v retrieving revision 1.56.8.4 retrieving revision 1.56.8.5 diff -C2 -d -r1.56.8.4 -r1.56.8.5 *** dist.tex 19 Oct 2003 07:31:14 -0000 1.56.8.4 --- dist.tex 1 Apr 2004 03:56:46 -0000 1.56.8.5 *************** *** 1004,1007 **** --- 1004,1008 ---- \option{libraries} options (\XXX{getting C library sources currently broken -- no get\_source\_files() method in build\_clib.py!}) + \item scripts identified by the \option{scripts} option \item anything that looks like a test script: \file{test/test*.py} (currently, the Distutils don't do anything with test scripts except

1 0

python/dist/src/Python import.c,2.229,2.230
by jhylton＠users.sourceforge.net 01 Apr '04

01 Apr '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32543 Modified Files: import.c Log Message: Bump the magic number to avoid sharing bytecode between 2.3 and 2.4. Revise the long comment that explained details of the magic number in gory detail. Index: import.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/import.c,v retrieving revision 2.229 retrieving revision 2.230 diff -C2 -d -r2.229 -r2.230 *** import.c 26 Mar 2004 15:09:27 -0000 2.229 --- import.c 1 Apr 2004 02:45:22 -0000 2.230 *************** *** 20,56 **** /* In getmtime.c */ ! /* Magic word to reject .pyc files generated by other Python versions */ ! /* Change for each incompatible change */ ! /* The value of CR and LF is incorporated so if you ever read or write a .pyc file in text mode the magic number will be wrong; also, the Apple MPW compiler swaps their values, botching string constants. - XXX That probably isn't important anymore. - */ - /* XXX Perhaps the magic number should be frozen and a version field - added to the .pyc file header? */ - /* New way to come up with the low 16 bits of the magic number: - (YEAR-1995) * 10000 + MONTH * 100 + DAY - where MONTH and DAY are 1-based. - XXX Whatever the "old way" may have been isn't documented. - XXX This scheme breaks in 2002, as (2002-1995)*10000 = 70000 doesn't - fit in 16 bits. - XXX Later, sometimes 1 gets added to MAGIC in order to record that - the Unicode -U option is in use. IMO (Tim's), that's a Bad Idea - (quite apart from that the -U option doesn't work so isn't used - anyway). ! XXX MAL, 2002-02-07: I had to modify the MAGIC due to a fix of the ! UTF-8 encoder (it previously produced invalid UTF-8 for unpaired ! high surrogates), so I simply bumped the month value to 20 (invalid ! month) and set the day to 1. This should be recognizable by any ! algorithm relying on the above scheme. Perhaps we should simply ! start counting in increments of 10 from now on ?! ! ! MWH, 2002-08-03: Removed SET_LINENO. Couldn't be bothered figuring ! out the MAGIC schemes, so just incremented it by 10. ! GvR, 2002-08-31: Because MWH changed the bytecode again, moved the ! magic number *back* to 62011. This should get the snake-farm to ! throw away its old .pyc files, amongst others. Known values: --- 20,37 ---- /* In getmtime.c */ ! /* Magic word to reject .pyc files generated by other Python versions. ! It should change for each incompatible change to the bytecode. ! ! The value of CR and LF is incorporated so if you ever read or write a .pyc file in text mode the magic number will be wrong; also, the Apple MPW compiler swaps their values, botching string constants. ! Apparently, there was a distinction made between even and odd ! bytecodes that is related to Unicode. The details aren't clear, ! but the magic number has been odd for a long time. ! There were a variety of old schemes for setting the magic number. ! The current working scheme is to increment the previous value by ! 10. Known values: *************** *** 67,72 **** Python 2.3a0: 62021 Python 2.3a0: 62011 (!) */ ! #define MAGIC (62011 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the --- 48,54 ---- Python 2.3a0: 62021 Python 2.3a0: 62011 (!) + Python 2.4a0: 62031 */ ! #define MAGIC (62031 | ((long)'\r'<<16) | ((long)'\n'<<24)) /* Magic word as global; note that _PyImport_Init() can change the

1 0