Mailman 3 October 2004 - Python-checkins

python/dist/src/Lib os.py, 1.82, 1.83 popen2.py, 1.29, 1.30
by jlgijsbers＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22303/Lib Modified Files: os.py popen2.py Log Message: Document that on Unix, the 'cmd' argument to the os.popen2/3/4 and popen2.popen2/3/4 functions can be a sequence. All texts are a variation on the following: On \UNIX, \var{cmd} may be a sequence, in which case arguments will be passed directly to the program without shell intervention (as with \function{os.spawnv()}). If \var{cmd} is a string it will be passed to the shell (as with \function{os.system()}). Index: os.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/os.py,v retrieving revision 1.82 retrieving revision 1.83 diff -u -d -r1.82 -r1.83 --- os.py 18 Sep 2004 16:07:58 -0000 1.82 +++ os.py 11 Oct 2004 18:12:15 -0000 1.83 @@ -611,6 +611,12 @@ if _exists("fork"): if not _exists("popen2"): def popen2(cmd, mode="t", bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' + may be a sequence, in which case arguments will be passed directly to + the program without shell intervention (as with os.spawnv()). If 'cmd' + is a string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdin, child_stdout) are returned.""" import popen2 stdout, stdin = popen2.popen2(cmd, bufsize) return stdin, stdout @@ -618,6 +624,12 @@ if not _exists("popen3"): def popen3(cmd, mode="t", bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' + may be a sequence, in which case arguments will be passed directly to + the program without shell intervention (as with os.spawnv()). If 'cmd' + is a string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdin, child_stdout, child_stderr) are returned.""" import popen2 stdout, stdin, stderr = popen2.popen3(cmd, bufsize) return stdin, stdout, stderr @@ -625,6 +637,12 @@ if not _exists("popen4"): def popen4(cmd, mode="t", bufsize=-1): + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' + may be a sequence, in which case arguments will be passed directly to + the program without shell intervention (as with os.spawnv()). If 'cmd' + is a string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdin, child_stdout_stderr) are returned.""" import popen2 stdout, stdin = popen2.popen4(cmd, bufsize) return stdin, stdout Index: popen2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/popen2.py,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- popen2.py 12 Feb 2004 17:35:06 -0000 1.29 +++ popen2.py 11 Oct 2004 18:12:20 -0000 1.30 @@ -30,10 +30,14 @@ def __init__(self, cmd, capturestderr=False, bufsize=-1): """The parameter 'cmd' is the shell command to execute in a - sub-process. The 'capturestderr' flag, if true, specifies that - the object should capture standard error output of the child process. - The default is false. If the 'bufsize' parameter is specified, it - specifies the size of the I/O buffers to/from the child process.""" + sub-process. On UNIX, 'cmd' may be a sequence, in which case arguments + will be passed directly to the program without shell intervention (as + with os.spawnv()). If 'cmd' is a string it will be passed to the shell + (as with os.system()). The 'capturestderr' flag, if true, specifies + that the object should capture standard error output of the child + process. The default is false. If the 'bufsize' parameter is + specified, it specifies the size of the I/O buffers to/from the child + process.""" _cleanup() p2cread, p2cwrite = os.pipe() c2pread, c2pwrite = os.pipe() @@ -120,44 +124,62 @@ del Popen3, Popen4 def popen2(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout, child_stdin) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout, child_stdin) are returned.""" w, r = os.popen2(cmd, mode, bufsize) return r, w def popen3(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout, child_stdin, child_stderr) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout, child_stdin, child_stderr) are returned.""" w, r, e = os.popen3(cmd, mode, bufsize) return r, w, e def popen4(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout_stderr, child_stdin) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout_stderr, child_stdin) are returned.""" w, r = os.popen4(cmd, mode, bufsize) return r, w else: def popen2(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout, child_stdin) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout, child_stdin) are returned.""" inst = Popen3(cmd, False, bufsize) return inst.fromchild, inst.tochild def popen3(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout, child_stdin, child_stderr) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout, child_stdin, child_stderr) are returned.""" inst = Popen3(cmd, True, bufsize) return inst.fromchild, inst.tochild, inst.childerr def popen4(cmd, bufsize=-1, mode='t'): - """Execute the shell command 'cmd' in a sub-process. If 'bufsize' is - specified, it sets the buffer size for the I/O pipes. The file objects - (child_stdout_stderr, child_stdin) are returned.""" + """Execute the shell command 'cmd' in a sub-process. On UNIX, 'cmd' may + be a sequence, in which case arguments will be passed directly to the + program without shell intervention (as with os.spawnv()). If 'cmd' is a + string it will be passed to the shell (as with os.system()). If + 'bufsize' is specified, it sets the buffer size for the I/O pipes. The + file objects (child_stdout_stderr, child_stdin) are returned.""" inst = Popen4(cmd, bufsize) return inst.fromchild, inst.tochild

1 0

[Python-checkins] python/dist/src/Lib/compiler transformer.py, 1.47, 1.48
by mwh＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/compiler In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17868 Modified Files: transformer.py Log Message: This is jiwon's patch to fix: [ 1042238 ] Lib/compiler chokes on certain genexps Index: transformer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/compiler/transformer.py,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- transformer.py 12 Sep 2004 03:49:30 -0000 1.47 +++ transformer.py 11 Oct 2004 15:35:53 -0000 1.48 @@ -1165,8 +1165,13 @@ if node[0] == token.STAR or node[0] == token.DOUBLESTAR: break kw, result = self.com_argument(node, kw) - if len_nodelist != 2 and isinstance(result, GenExpr): + + if len_nodelist != 2 and isinstance(result, GenExpr) \ + and len(node) == 3 and node[2][0] == symbol.gen_for: + # allow f(x for x in y), but reject f(x for x in y, 1) + # should use f((x for x in y), 1) instead of f(x for x in y, 1) raise SyntaxError, 'generator expression needs parenthesis' + args.append(result) else: # No broken by star arg, so skip the last one we processed.

1 0

python/dist/src/Lib/test test_compiler.py, 1.8, 1.9
by mwh＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17678 Modified Files: test_compiler.py Log Message: Open source files in universal newlines mode. Index: test_compiler.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_compiler.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test_compiler.py 12 Sep 2004 03:49:31 -0000 1.8 +++ test_compiler.py 11 Oct 2004 15:34:31 -0000 1.9 @@ -24,7 +24,7 @@ path = os.path.join(dir, basename) if test.test_support.verbose: print "compiling", path - f = open(path) + f = open(path, "U") buf = f.read() f.close() if "badsyntax" in basename:

1 0

python/dist/src/Misc NEWS,1.1157,1.1158
by bwarsaw＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4365 Modified Files: NEWS Log Message: Added note about the new usegmt argument to email.Utils.formatdate(). Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1157 retrieving revision 1.1158 diff -u -d -r1.1157 -r1.1158 --- NEWS 11 Oct 2004 02:40:48 -0000 1.1157 +++ NEWS 11 Oct 2004 14:32:47 -0000 1.1158 @@ -50,6 +50,7 @@ Closes bug #1039270. - Updates for the email package: + + email.Utils.formatdate() grew a 'usegmt' argument for HTTP support. + All deprecated APIs that in email 2.x issued warnings have been removed: _encoder argument to the MIMEText constructor, Message.add_payload(), Utils.dump_address_pair(), Utils.decode(), Utils.encode()

1 0

[Python-checkins] python/dist/src/Lib/email/test test_email.py, 1.63, 1.64
by anthonybaxter＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/email/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26235/Lib/email/test Modified Files: test_email.py Log Message: Added a usegmt flag to email.Utils.formatdate - this allows it to be used to replace rfc822.formatdate for protocols like HTTP (where 'GMT' must be the timezone string). Index: test_email.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/email/test/test_email.py,v retrieving revision 1.63 retrieving revision 1.64 diff -u -d -r1.63 -r1.64 --- test_email.py 9 Oct 2004 22:57:33 -0000 1.63 +++ test_email.py 11 Oct 2004 13:53:08 -0000 1.64 @@ -2037,6 +2037,15 @@ Utils.parsedate(Utils.formatdate(now, localtime=True))[:6], time.localtime(now)[:6]) + def test_formatdate_usegmt(self): + now = time.time() + self.assertEqual( + Utils.formatdate(now, localtime=False), + time.strftime('%a, %d %b %Y %H:%M:%S -0000', time.gmtime(now))) + self.assertEqual( + Utils.formatdate(now, localtime=False, usegmt=True), + time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime(now))) + def test_parsedate_none(self): self.assertEqual(Utils.parsedate(''), None)

1 0

python/dist/src/Lib urllib.py, 1.164, 1.165 urllib2.py, 1.76, 1.77
by anthonybaxter＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26235/Lib Modified Files: urllib.py urllib2.py Log Message: Added a usegmt flag to email.Utils.formatdate - this allows it to be used to replace rfc822.formatdate for protocols like HTTP (where 'GMT' must be the timezone string). Index: urllib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib.py,v retrieving revision 1.164 retrieving revision 1.165 diff -u -d -r1.164 -r1.165 --- urllib.py 18 Jul 2004 06:14:41 -0000 1.164 +++ urllib.py 11 Oct 2004 13:53:07 -0000 1.165 @@ -410,7 +410,7 @@ def open_local_file(self, url): """Use local file.""" - import mimetypes, mimetools, rfc822, StringIO + import mimetypes, mimetools, email.Utils, StringIO host, file = splithost(url) localname = url2pathname(file) try: @@ -418,7 +418,7 @@ except OSError, e: raise IOError(e.errno, e.strerror, e.filename) size = stats.st_size - modified = rfc822.formatdate(stats.st_mtime) + modified = email.Utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(url)[0] headers = mimetools.Message(StringIO.StringIO( 'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' % Index: urllib2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v retrieving revision 1.76 retrieving revision 1.77 diff -u -d -r1.76 -r1.77 --- urllib2.py 31 Aug 2004 11:38:12 -0000 1.76 +++ urllib2.py 11 Oct 2004 13:53:07 -0000 1.77 @@ -99,7 +99,6 @@ import posixpath import random import re -import rfc822 import sha import socket import sys @@ -1129,12 +1128,13 @@ # not entirely sure what the rules are here def open_local_file(self, req): + import email.Utils host = req.get_host() file = req.get_selector() localfile = url2pathname(file) stats = os.stat(localfile) size = stats.st_size - modified = rfc822.formatdate(stats.st_mtime) + modified = email.Utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(file)[0] headers = mimetools.Message(StringIO( 'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %

1 0

python/dist/src/Lib/email Utils.py,1.27,1.28
by anthonybaxter＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Lib/email In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26235/Lib/email Modified Files: Utils.py Log Message: Added a usegmt flag to email.Utils.formatdate - this allows it to be used to replace rfc822.formatdate for protocols like HTTP (where 'GMT' must be the timezone string). Index: Utils.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/email/Utils.py,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- Utils.py 3 Oct 2004 03:16:18 -0000 1.27 +++ Utils.py 11 Oct 2004 13:53:07 -0000 1.28 @@ -103,7 +103,7 @@ -def formatdate(timeval=None, localtime=False): +def formatdate(timeval=None, localtime=False, usegmt=False): """Returns a date string as specified by RFC 2822, e.g.: Fri, 09 Nov 2001 01:08:47 -0000 @@ -114,6 +114,10 @@ Optional localtime is a flag that when True, interprets timeval, and returns a date relative to the local timezone instead of UTC, properly taking daylight savings time into account. + + Optional argument usegmt means that the timezone is written out as + an ascii string, not numeric one (so "GMT" instead of "+0000"). This + is needed for HTTP, and is only used when localtime==False. """ # Note: we cannot use strftime() because that honors the locale and RFC # 2822 requires that day and month names be the English abbreviations. @@ -138,7 +142,10 @@ else: now = time.gmtime(timeval) # Timezone offset is always -0000 - zone = '-0000' + if usegmt: + zone = 'GMT' + else: + zone = '-0000' return '%s, %02d %s %04d %02d:%02d:%02d %s' % ( ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][now[6]], now[2],

1 0

python/dist/src/Doc/lib emailutil.tex,1.9,1.10
by anthonybaxter＠users.sourceforge.net 11 Oct '04

11 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26235/Doc/lib Modified Files: emailutil.tex Log Message: Added a usegmt flag to email.Utils.formatdate - this allows it to be used to replace rfc822.formatdate for protocols like HTTP (where 'GMT' must be the timezone string). Index: emailutil.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/lib/emailutil.tex,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- emailutil.tex 3 Oct 2004 03:16:17 -0000 1.9 +++ emailutil.tex 11 Oct 2004 13:53:07 -0000 1.10 @@ -84,7 +84,7 @@ common use. \end{funcdesc} -\begin{funcdesc}{formatdate}{\optional{timeval\optional{, localtime}}} +\begin{funcdesc}{formatdate}{\optional{timeval\optional{, localtime}\optional{, usegmt}}} Returns a date string as per \rfc{2822}, e.g.: \begin{verbatim} @@ -99,6 +99,11 @@ \var{timeval}, and returns a date relative to the local timezone instead of UTC, properly taking daylight savings time into account. The default is \code{False} meaning UTC is used. + +Optional \var{usegmt} is a flag that when \code{True}, outputs a +date string with the timezone as an ascii string \code{GMT}, rather +than a numeric \code{-0000}. This is needed for some protocols (such +as HTTP). This only applies when \var{localtime} is \code{False} \end{funcdesc} \begin{funcdesc}{make_msgid}{\optional{idstring}}

1 0

python/dist/src/Include ceval.h,2.52,2.53
by tim_one＠users.sourceforge.net 10 Oct '04

10 Oct '04

Update of /cvsroot/python/python/dist/src/Include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23529/Include Modified Files: ceval.h Log Message: SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Coghlan, for determining whether PyEval_InitThreads() has been called. Also purged the undocumented+unused _PyThread_Started int. Index: ceval.h =================================================================== RCS file: /cvsroot/python/python/dist/src/Include/ceval.h,v retrieving revision 2.52 retrieving revision 2.53 diff -u -d -r2.52 -r2.53 --- ceval.h 27 Jun 2004 15:43:12 -0000 2.52 +++ ceval.h 11 Oct 2004 02:40:35 -0000 2.53 @@ -120,6 +120,7 @@ #ifdef WITH_THREAD +PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); PyAPI_FUNC(void) PyEval_InitThreads(void); PyAPI_FUNC(void) PyEval_AcquireLock(void); PyAPI_FUNC(void) PyEval_ReleaseLock(void);

1 0

python/dist/src/Doc/api init.tex,1.20,1.21
by tim_one＠users.sourceforge.net 10 Oct '04

10 Oct '04

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23529/Doc/api Modified Files: init.tex Log Message: SF patch 1044089: New C API function PyEval_ThreadsInitialized(), by Nick Coghlan, for determining whether PyEval_InitThreads() has been called. Also purged the undocumented+unused _PyThread_Started int. Index: init.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/init.tex,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- init.tex 19 Aug 2004 11:31:55 -0000 1.20 +++ init.tex 11 Oct 2004 02:40:35 -0000 1.21 @@ -24,7 +24,7 @@ \end{cfuncdesc} \begin{cfuncdesc}{void}{Py_InitializeEx}{int initsigs} - This function works like \cfunction{Py_Initialize} if + This function works like \cfunction{Py_Initialize()} if \var{initsigs} is 1. If \var{initsigs} is 0, it skips initialization registration of signal handlers, which might be useful when Python is embedded. \versionadded{2.4} @@ -517,14 +517,14 @@ This is a common situation (most Python programs do not use threads), and the lock operations slow the interpreter down a bit. Therefore, the lock is not created initially. This situation is - equivalent to having acquired the lock: when there is only a single + equivalent to having acquired the lock: when there is only a single thread, all object accesses are safe. Therefore, when this function initializes the lock, it also acquires it. Before the Python \module{thread}\refbimodindex{thread} module creates a new thread, knowing that either it has the lock or the lock hasn't been created yet, it calls \cfunction{PyEval_InitThreads()}. When this call - returns, it is guaranteed that the lock has been created and that it - has acquired it. + returns, it is guaranteed that the lock has been created and that the + calling thread has acquired it. It is \strong{not} safe to call this function when it is unknown which thread (if any) currently has the global interpreter lock. @@ -533,6 +533,14 @@ compile time. \end{cfuncdesc} +\begin{cfuncdesc}{int}{PyEval_ThreadsInitialized}{} + Returns a non-zero value if \cfunction{PyEval_InitThreads()} has been + called. This function can be called without holding the lock, and + therefore can be used to avoid calls to the locking API when running + single-threaded. This function is not available when thread support + is disabled at compile time. \versionadded{2.4} +\end{cfuncdesc} + \begin{cfuncdesc}{void}{PyEval_AcquireLock}{} Acquire the global interpreter lock. The lock must have been created earlier. If this thread already has the lock, a deadlock

1 0