diff options
| author | Christian Heimes <christian@cheimes.de> | 2008-01-01 14:42:15 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2008-01-01 14:42:15 (GMT) |
| commit | d9a4d1d5876203c17fa646c8908d15dfda99219a (patch) | |
| tree | 4b0fef73e08649d0044724dea4c124d63d8da7ce /Lib | |
| parent | f5243f07f640f4ae847f2d56e86f5b48ed78728a (diff) | |
| download | cpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.zip cpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.tar.gz cpython-d9a4d1d5876203c17fa646c8908d15dfda99219a.tar.bz2 | |
Merged revisions 59628-59641 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59631 | christian.heimes | 2007-12-31 20:16:56 +0100 (Mon, 31 Dec 2007) | 1 line
Fixed path
........
r59632 | christian.heimes | 2007-12-31 20:20:57 +0100 (Mon, 31 Dec 2007) | 1 line
Fixed path to _ssl.c in Windows make file
........
r59633 | christian.heimes | 2007-12-31 20:23:22 +0100 (Mon, 31 Dec 2007) | 1 line
Fixed path to _ssl.c in Windows make file, take two
........
r59634 | christian.heimes | 2007-12-31 20:25:22 +0100 (Mon, 31 Dec 2007) | 1 line
Fixed path to _ssl.c in Windows make file, take three ...
........
r59635 | neal.norwitz | 2008-01-01 00:48:47 +0100 (Tue, 01 Jan 2008) | 1 line
Fix refleak
........
r59637 | guido.van.rossum | 2008-01-01 05:15:29 +0100 (Tue, 01 Jan 2008) | 5 lines
Fix an odd error which would only occur close to new year's eve, due
to use of datetime.datetime.now() instead of utcnow() for comparison.
(I think the test can still fail if it's executed pretty much *at*
new year's eve, but that's not worth fixing.)
........
r59638 | christian.heimes | 2008-01-01 14:40:26 +0100 (Tue, 01 Jan 2008) | 1 line
MSI uses back slashes as path separators
........
r59639 | christian.heimes | 2008-01-01 14:52:57 +0100 (Tue, 01 Jan 2008) | 1 line
Added new wininst files to msi.py and adjusted some paths
........
r59640 | christian.heimes | 2008-01-01 14:58:16 +0100 (Tue, 01 Jan 2008) | 1 line
The root of the project is two levels up from PC/VS7.1
........
r59641 | christian.heimes | 2008-01-01 15:37:32 +0100 (Tue, 01 Jan 2008) | 1 line
Added support for new Windows build dirs in PC/ to distutils.sysconfig
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/distutils/sysconfig.py | 4 | ||||
| -rw-r--r-- | Lib/sqlite3/test/types.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index ba89c3b..4d790cc 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -27,6 +27,10 @@ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) project_base = os.path.dirname(os.path.abspath(sys.executable)) if os.name == "nt" and "pcbuild" in project_base[-8:].lower(): project_base = os.path.abspath(os.path.join(project_base, os.path.pardir)) +# PC/VS7.1 +if os.name == "nt" and "\\pc\\v" in project_base[-10:].lower(): + project_base = os.path.abspath(os.path.join(project_base, os.path.pardir, + os.path.pardir)) # python_build: (Boolean) if true, we're either building Python or # building an extension with an un-installed Python, so we use diff --git a/Lib/sqlite3/test/types.py b/Lib/sqlite3/test/types.py index 8845e0c..46bed7d 100644 --- a/Lib/sqlite3/test/types.py +++ b/Lib/sqlite3/test/types.py @@ -341,8 +341,7 @@ class DateTimeTests(unittest.TestCase): if sqlite.sqlite_version_info < (3, 1): return - # SQLite's current_timestamp uses UTC time, while datetime.datetime.now() uses local time. - now = datetime.datetime.now() + now = datetime.datetime.utcnow() self.cur.execute("insert into test(ts) values (current_timestamp)") self.cur.execute("select ts from test") ts = self.cur.fetchone()[0] |