diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-02-23 18:30:17 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-02-23 18:30:17 (GMT) |
| commit | 05e8be17fd15d8e649e026600f5ab20e1154599f (patch) | |
| tree | aecf3cd024e9cf2ed2ae49087b6c74dba29c7c7e /Tools/pybench | |
| parent | 5abe9125f9eb858fdaca966d687bb32387603f45 (diff) | |
| download | cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.zip cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.tar.gz cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.tar.bz2 | |
Merged revisions 60990-61002 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60990 | eric.smith | 2008-02-23 17:05:26 +0100 (Sat, 23 Feb 2008) | 1 line
Removed duplicate Py_CHARMASK define. It's already defined in Python.h.
........
r60991 | andrew.kuchling | 2008-02-23 17:23:05 +0100 (Sat, 23 Feb 2008) | 4 lines
#1330538: Improve comparison of xmlrpclib.DateTime and datetime instances.
Remove automatic handling of datetime.date and datetime.time.
This breaks backward compatibility, but python-dev discussion was strongly
against this automatic conversion; see the bug for a link.
........
r60994 | andrew.kuchling | 2008-02-23 17:39:43 +0100 (Sat, 23 Feb 2008) | 1 line
#835521: Add index entries for various pickle-protocol methods and attributes
........
r60995 | andrew.kuchling | 2008-02-23 18:10:46 +0100 (Sat, 23 Feb 2008) | 2 lines
#1433694: minidom's .normalize() failed to set .nextSibling for last element.
Fix by Malte Helmert
........
r61000 | christian.heimes | 2008-02-23 18:40:11 +0100 (Sat, 23 Feb 2008) | 1 line
Patch #2167 from calvin: Remove unused imports
........
r61001 | christian.heimes | 2008-02-23 18:42:31 +0100 (Sat, 23 Feb 2008) | 1 line
Patch #1957: syslogmodule: Release GIL when calling syslog(3)
........
r61002 | christian.heimes | 2008-02-23 18:52:07 +0100 (Sat, 23 Feb 2008) | 2 lines
Issue #2051 and patch from Alexander Belopolsky:
Permission for pyc and pyo files are inherited from the py file.
........
Diffstat (limited to 'Tools/pybench')
| -rw-r--r-- | Tools/pybench/systimes.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/pybench/systimes.py b/Tools/pybench/systimes.py index fb3d3b5..cc880c5 100644 --- a/Tools/pybench/systimes.py +++ b/Tools/pybench/systimes.py @@ -31,7 +31,7 @@ the author. All Rights Reserved. """ -import time, sys, struct +import time, sys # # Note: Please keep this module compatible to Python 1.5.2. |