Mailman 3 February 2005 - Python-checkins

python/dist/src configure.in, 1.481, 1.482 configure, 1.468, 1.469
by bcannon＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7187 Modified Files: configure.in configure Log Message: Modified test for tzset to not rely on tm->tm_zone's existence. Also added sanity checks on tzname if HAVE_TZNAME defined. Closes bug #1096244. Thanks Gregory Bond. Index: configure.in =================================================================== RCS file: /cvsroot/python/python/dist/src/configure.in,v retrieving revision 1.481 retrieving revision 1.482 diff -u -d -r1.481 -r1.482 --- configure.in 23 Jan 2005 09:27:22 -0000 1.481 +++ configure.in 10 Feb 2005 20:45:37 -0000 1.482 @@ -2917,45 +2917,74 @@ [Define if poll() sets errno on invalid file descriptors.]) fi +# Before we can test tzset, we need to check if struct tm has a tm_zone +# (which is not required by ISO C or UNIX spec) and/or if we support +# tzname[] +AC_STRUCT_TIMEZONE -# tzset(3) exists and works like we expect it to +# check tzset(3) exists and works like we expect it to AC_MSG_CHECKING(for working tzset()) AC_CACHE_VAL(ac_cv_working_tzset, [ AC_TRY_RUN([ #include <stdlib.h> #include <time.h> #include <string.h> + +#if HAVE_TZNAME +extern char *tzname[]; +#endif + int main() { /* Note that we need to ensure that not only does tzset(3) do 'something' with localtime, but it works as documented in the library reference and as expected by the test suite. + This includes making sure that tzname is set properly if + tm->tm_zone does not exist since it is the alternative way + of getting timezone info. Red Hat 6.2 doesn't understand the southern hemisphere - after New Year's Day; it thinks swaps on that day. + after New Year's Day. */ - time_t groundhogday = 1044144000; /* GMT-based; well, it's a colony */ + time_t groundhogday = 1044144000; /* GMT-based */ time_t midyear = groundhogday + (365 * 24 * 3600 / 2); putenv("TZ=UTC+0"); tzset(); if (localtime(&groundhogday)->tm_hour != 0) exit(1); +#if HAVE_TZNAME + /* For UTC, tzname[1] is sometimes "", sometimes " " */ + if (strcmp(tzname[0], "UTC") || + (tzname[1][0] != 0 && tzname[1][0] != ' ')) + exit(1); +#endif putenv("TZ=EST+5EDT,M4.1.0,M10.5.0"); tzset(); if (localtime(&groundhogday)->tm_hour != 19) exit(1); +#if HAVE_TZNAME + if (strcmp(tzname[0], "EST") || strcmp(tzname[1], "EDT")) + exit(1); +#endif putenv("TZ=AEST-10AEDT-11,M10.5.0,M3.5.0"); tzset(); if (localtime(&groundhogday)->tm_hour != 11) exit(1); +#if HAVE_TZNAME + if (strcmp(tzname[0], "AEST") || strcmp(tzname[1], "AEDT")) + exit(1); +#endif + +#if HAVE_STRUCT_TM_TM_ZONE if (strcmp(localtime(&groundhogday)->tm_zone, "AEDT")) exit(1); if (strcmp(localtime(&midyear)->tm_zone, "AEST")) exit(1); +#endif exit(0); } Index: configure =================================================================== RCS file: /cvsroot/python/python/dist/src/configure,v retrieving revision 1.468 retrieving revision 1.469 diff -u -d -r1.468 -r1.469 --- configure 23 Jan 2005 09:27:17 -0000 1.468 +++ configure 10 Feb 2005 20:45:41 -0000 1.469 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.480 . +# From configure.in Revision: 1.481 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for python 2.5. # @@ -976,7 +976,7 @@ else echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi - cd "$ac_popdir" [...2278 lines suppressed...] + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ @@ -20854,12 +21282,6 @@ fi;; esac done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub

1 0

python/dist/src/Misc NEWS, 1.1239, 1.1240 ACKS, 1.293, 1.294
by bcannon＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7187/Misc Modified Files: NEWS ACKS Log Message: Modified test for tzset to not rely on tm->tm_zone's existence. Also added sanity checks on tzname if HAVE_TZNAME defined. Closes bug #1096244. Thanks Gregory Bond. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1239 retrieving revision 1.1240 diff -u -d -r1.1239 -r1.1240 --- NEWS 5 Feb 2005 01:31:19 -0000 1.1239 +++ NEWS 10 Feb 2005 20:47:44 -0000 1.1240 @@ -161,6 +161,11 @@ ``-L/opt/local/lib`` for DarwinPorts) and CPPFLAGS (``-I/sw/include`` for Fink, ``-I/opt/local/include`` for DarwinPorts). +- Test in configure.in that checks for tzset no longer dependent on tm->tm_zone + to exist in the struct (not required by either ISO C nor the UNIX 2 spec). + Tests for sanity in tzname when HAVE_TZNAME defined were also defined. + Closes bug #1096244. Thanks Gregory Bond. + C API ----- Index: ACKS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/ACKS,v retrieving revision 1.293 retrieving revision 1.294 diff -u -d -r1.293 -r1.294 --- ACKS 5 Feb 2005 01:31:18 -0000 1.293 +++ ACKS 10 Feb 2005 20:48:03 -0000 1.294 @@ -66,6 +66,7 @@ Paul Boddie Matthew Boedicker David Bolen +Gregory Bond Jurjen Bos Peter Bosch Eric Bouck

1 0

python/dist/src/Lib/test test_peepholer.py, 1.10, 1.11
by bcannon＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5299/Lib/test Modified Files: test_peepholer.py Log Message: Remove set conversion optimization test (backed out of Python/compile.c in rev. 2.344). Index: test_peepholer.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_peepholer.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- test_peepholer.py 7 Feb 2005 19:32:38 -0000 1.10 +++ test_peepholer.py 10 Feb 2005 20:40:29 -0000 1.11 @@ -133,17 +133,6 @@ asm = dis_single('a="x"*1000') self.assert_('(1000)' in asm) - def test_set_conversion(self): - for line in ( - 'x in [1,2,3]', - 'x in (1,2,3)', - 'x not in (1,2,3)', - 'not x in (1,2,3)', - 'not x not in (1,2,3)', - ): - asm = dis_single(line) - self.assert_('frozenset' in asm) - def test_elim_extra_return(self): # RETURN LOAD_CONST None RETURN --> RETURN def f(x):

1 0

python/dist/src/Lib xmlrpclib.py,1.38,1.39
by fdrake＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18795/Lib Modified Files: xmlrpclib.py Log Message: accept datetime.datetime instances when marshalling; dateTime.iso8601 elements still unmarshal into xmlrpclib.DateTime objects Index: xmlrpclib.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/xmlrpclib.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- xmlrpclib.py 7 Feb 2005 15:28:45 -0000 1.38 +++ xmlrpclib.py 10 Feb 2005 18:33:29 -0000 1.39 @@ -149,6 +149,11 @@ unicode = None # unicode support not available try: + import datetime +except ImportError: + datetime = None + +try: _bool_is_builtin = False.__class__.__name__ == "bool" except NameError: _bool_is_builtin = 0 @@ -349,7 +354,10 @@ def __init__(self, value=0): if not isinstance(value, StringType): - if not isinstance(value, (TupleType, time.struct_time)): + if datetime and isinstance(value, datetime.datetime): + self.value = value.strftime("%Y%m%dT%H:%M:%S") + return + elif not isinstance(value, (TupleType, time.struct_time)): if value == 0: value = time.time() value = time.localtime(value) @@ -699,6 +707,13 @@ del self.memo[i] dispatch[DictType] = dump_struct + if datetime: + def dump_datetime(self, value, write): + write("<value><dateTime.iso8601>") + write(value.strftime("%Y%m%dT%H:%M:%S")) + write("</dateTime.iso8601></value>\n") + dispatch[datetime.datetime] = dump_datetime + def dump_instance(self, value, write): # check for special wrappers if value.__class__ in WRAPPERS:

3 2

python/dist/src/Lib/test test_xmlrpc.py,1.5,1.6
by fdrake＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18795/Lib/test Modified Files: test_xmlrpc.py Log Message: accept datetime.datetime instances when marshalling; dateTime.iso8601 elements still unmarshal into xmlrpclib.DateTime objects Index: test_xmlrpc.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_xmlrpc.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- test_xmlrpc.py 5 Jun 2004 12:33:27 -0000 1.5 +++ test_xmlrpc.py 10 Feb 2005 18:33:30 -0000 1.6 @@ -1,3 +1,4 @@ +import datetime import sys import unittest import xmlrpclib @@ -12,6 +13,11 @@ 'boolean': xmlrpclib.False, 'unicode': u'\u4000\u6000\u8000', u'ukey\u4000': 'regular value', + 'datetime1': xmlrpclib.DateTime('20050210T11:41:23'), + 'datetime2': xmlrpclib.DateTime( + (2005, 02, 10, 11, 41, 23, 0, 1, -1)), + 'datetime3': xmlrpclib.DateTime( + datetime.datetime(2005, 02, 10, 11, 41, 23)), }] class XMLRPCTestCase(unittest.TestCase): @@ -20,6 +26,17 @@ self.assertEquals(alist, xmlrpclib.loads(xmlrpclib.dumps((alist,)))[0][0]) + def test_dump_bare_datetime(self): + # This checks that an unwrapped datetime object can be handled + # by the marshalling code. This can't be done via + # test_dump_load() since the unmarshaller doesn't produce base + # datetime instances. + dt = datetime.datetime(2005, 02, 10, 11, 41, 23) + s = xmlrpclib.dumps((dt,)) + r, m = xmlrpclib.loads(s) + self.assertEquals(r, (xmlrpclib.DateTime('20050210T11:41:23'),)) + self.assertEquals(m, None) + def test_dump_big_long(self): self.assertRaises(OverflowError, xmlrpclib.dumps, (2L**99,))

1 0

python/dist/src/Lib popen2.py,1.30,1.30.2.1
by akuchling＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv720/Lib Modified Files: Tag: release24-maint popen2.py Log Message: Fix typo Index: popen2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/popen2.py,v retrieving revision 1.30 retrieving revision 1.30.2.1 diff -u -d -r1.30 -r1.30.2.1 --- popen2.py 11 Oct 2004 18:12:20 -0000 1.30 +++ popen2.py 10 Feb 2005 13:46:14 -0000 1.30.2.1 @@ -213,7 +213,7 @@ raise ValueError("wrote %r read %r" % (teststr, got)) got = e.read() if got: - raise ValueError("unexected %r on stderr" % (got,)) + raise ValueError("unexpected %r on stderr" % (got,)) for inst in _active[:]: inst.wait() if _active:

1 0

python/dist/src/Lib/test test_popen2.py, 1.8, 1.8.4.1
by akuchling＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv720/Lib/test Modified Files: Tag: release24-maint test_popen2.py Log Message: Fix typo Index: test_popen2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_popen2.py,v retrieving revision 1.8 retrieving revision 1.8.4.1 diff -u -d -r1.8 -r1.8.4.1 --- test_popen2.py 12 Feb 2004 17:35:11 -0000 1.8 +++ test_popen2.py 10 Feb 2005 13:46:14 -0000 1.8.4.1 @@ -62,7 +62,7 @@ raise ValueError("wrote %r read %r" % (teststr, got)) got = e.read() if got: - raise ValueError("unexected %r on stderr" % (got,)) + raise ValueError("unexpected %r on stderr" % (got,)) for inst in popen2._active[:]: inst.wait() if popen2._active:

1 0

python/dist/src/Lib popen2.py,1.30,1.31
by akuchling＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23112/Lib Modified Files: popen2.py Log Message: Fix typo Index: popen2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/popen2.py,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- popen2.py 11 Oct 2004 18:12:20 -0000 1.30 +++ popen2.py 10 Feb 2005 13:24:49 -0000 1.31 @@ -213,7 +213,7 @@ raise ValueError("wrote %r read %r" % (teststr, got)) got = e.read() if got: - raise ValueError("unexected %r on stderr" % (got,)) + raise ValueError("unexpected %r on stderr" % (got,)) for inst in _active[:]: inst.wait() if _active:

1 0

python/dist/src/Lib/test test_popen2.py,1.8,1.9
by akuchling＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23112/Lib/test Modified Files: test_popen2.py Log Message: Fix typo Index: test_popen2.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/test/test_popen2.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- test_popen2.py 12 Feb 2004 17:35:11 -0000 1.8 +++ test_popen2.py 10 Feb 2005 13:24:50 -0000 1.9 @@ -62,7 +62,7 @@ raise ValueError("wrote %r read %r" % (teststr, got)) got = e.read() if got: - raise ValueError("unexected %r on stderr" % (got,)) + raise ValueError("unexpected %r on stderr" % (got,)) for inst in popen2._active[:]: inst.wait() if popen2._active:

1 0

python/dist/src/Lib subprocess.py,1.14,1.15
by astrand＠users.sourceforge.net Feb. 10, 2005

Feb. 10, 2005

Update of /cvsroot/python/python/dist/src/Lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30793 Modified Files: subprocess.py Log Message: Patch from Leandro Lucarella: replaced: var == None and var != None with var is None and var is not None and type(var) == int with instanceof(var, int) ...as recomended in PEP 8 [1]. Index: subprocess.py =================================================================== RCS file: /cvsroot/python/python/dist/src/Lib/subprocess.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- subprocess.py 7 Feb 2005 14:16:21 -0000 1.14 +++ subprocess.py 10 Feb 2005 08:32:50 -0000 1.15 @@ -623,42 +623,42 @@ """Construct and return tupel with IO objects: p2cread, p2cwrite, c2pread, c2pwrite, errread, errwrite """ - if stdin == None and stdout == None and stderr == None: + if stdin is None and stdout is None and stderr is None: return (None, None, None, None, None, None) p2cread, p2cwrite = None, None c2pread, c2pwrite = None, None errread, errwrite = None, None - if stdin == None: + if stdin is None: p2cread = GetStdHandle(STD_INPUT_HANDLE) elif stdin == PIPE: p2cread, p2cwrite = CreatePipe(None, 0) # Detach and turn into fd p2cwrite = p2cwrite.Detach() p2cwrite = msvcrt.open_osfhandle(p2cwrite, 0) - elif type(stdin) == int: + elif isinstance(stdin, int): p2cread = msvcrt.get_osfhandle(stdin) else: # Assuming file-like object p2cread = msvcrt.get_osfhandle(stdin.fileno()) p2cread = self._make_inheritable(p2cread) - if stdout == None: + if stdout is None: c2pwrite = GetStdHandle(STD_OUTPUT_HANDLE) elif stdout == PIPE: c2pread, c2pwrite = CreatePipe(None, 0) # Detach and turn into fd c2pread = c2pread.Detach() c2pread = msvcrt.open_osfhandle(c2pread, 0) - elif type(stdout) == int: + elif isinstance(stdout, int): c2pwrite = msvcrt.get_osfhandle(stdout) else: # Assuming file-like object c2pwrite = msvcrt.get_osfhandle(stdout.fileno()) c2pwrite = self._make_inheritable(c2pwrite) - if stderr == None: + if stderr is None: errwrite = GetStdHandle(STD_ERROR_HANDLE) elif stderr == PIPE: errread, errwrite = CreatePipe(None, 0) @@ -667,7 +667,7 @@ errread = msvcrt.open_osfhandle(errread, 0) elif stderr == STDOUT: errwrite = c2pwrite - elif type(stderr) == int: + elif isinstance(stderr, int): errwrite = msvcrt.get_osfhandle(stderr) else: # Assuming file-like object @@ -715,7 +715,7 @@ # Process startup details default_startupinfo = STARTUPINFO() - if startupinfo == None: + if startupinfo is None: startupinfo = default_startupinfo if not None in (p2cread, c2pwrite, errwrite): startupinfo.dwFlags |= STARTF_USESTDHANDLES @@ -774,18 +774,18 @@ # output pipe are maintained in this process or else the # pipe will not close when the child process exits and the # ReadFile will hang. - if p2cread != None: + if p2cread is not None: p2cread.Close() - if c2pwrite != None: + if c2pwrite is not None: c2pwrite.Close() - if errwrite != None: + if errwrite is not None: errwrite.Close() def poll(self): """Check if child process has terminated. Returns returncode attribute.""" - if self.returncode == None: + if self.returncode is None: if WaitForSingleObject(self._handle, 0) == WAIT_OBJECT_0: self.returncode = GetExitCodeProcess(self._handle) _active.remove(self) @@ -795,7 +795,7 @@ def wait(self): """Wait for child process to terminate. Returns returncode attribute.""" - if self.returncode == None: + if self.returncode is None: obj = WaitForSingleObject(self._handle, INFINITE) self.returncode = GetExitCodeProcess(self._handle) _active.remove(self) @@ -831,7 +831,7 @@ stderr_thread.start() if self.stdin: - if input != None: + if input is not None: self.stdin.write(input) self.stdin.close() @@ -841,9 +841,9 @@ stderr_thread.join() # All data exchanged. Translate lists into strings. - if stdout != None: + if stdout is not None: stdout = stdout[0] - if stderr != None: + if stderr is not None: stderr = stderr[0] # Translate newlines, if requested. We cannot let the file @@ -871,33 +871,33 @@ c2pread, c2pwrite = None, None errread, errwrite = None, None - if stdin == None: + if stdin is None: pass elif stdin == PIPE: p2cread, p2cwrite = os.pipe() - elif type(stdin) == int: + elif isinstance(stdin, int): p2cread = stdin else: # Assuming file-like object p2cread = stdin.fileno() - if stdout == None: + if stdout is None: pass elif stdout == PIPE: c2pread, c2pwrite = os.pipe() - elif type(stdout) == int: + elif isinstance(stdout, int): c2pwrite = stdout else: # Assuming file-like object c2pwrite = stdout.fileno() - if stderr == None: + if stderr is None: pass elif stderr == PIPE: errread, errwrite = os.pipe() elif stderr == STDOUT: errwrite = c2pwrite - elif type(stderr) == int: + elif isinstance(stderr, int): errwrite = stderr else: # Assuming file-like object @@ -942,7 +942,7 @@ if shell: args = ["/bin/sh", "-c"] + args - if executable == None: + if executable is None: executable = args[0] # For transferring possible exec failure from child to parent @@ -985,13 +985,13 @@ if close_fds: self._close_fds(but=errpipe_write) - if cwd != None: + if cwd is not None: os.chdir(cwd) if preexec_fn: apply(preexec_fn) - if env == None: + if env is None: os.execvp(executable, args) else: os.execvpe(executable, args, env) @@ -1042,7 +1042,7 @@ def poll(self): """Check if child process has terminated. Returns returncode attribute.""" - if self.returncode == None: + if self.returncode is None: try: pid, sts = os.waitpid(self.pid, os.WNOHANG) if pid == self.pid: @@ -1055,7 +1055,7 @@ def wait(self): """Wait for child process to terminate. Returns returncode attribute.""" - if self.returncode == None: + if self.returncode is None: pid, sts = os.waitpid(self.pid, 0) self._handle_exitstatus(sts) return self.returncode @@ -1117,9 +1117,9 @@ stderr.append(data) # All data exchanged. Translate lists into strings. - if stdout != None: + if stdout is not None: stdout = ''.join(stdout) - if stderr != None: + if stderr is not None: stderr = ''.join(stderr) # Translate newlines, if requested. We cannot let the file

1 0