mirror of
https://github.com/python/cpython
synced 2024-09-05 08:17:45 +00:00
SF patch #706707, time.tzset standards compliance update by Stuart Bishop
Update configure and test to use proper timezone specifications
This commit is contained in:
Neal Norwitz
parent
bae5c965e8
commit
7f2588c073
|
|
@ -62,73 +62,55 @@ def test_tzset(self):
|
|||
# hemisphere.
|
||||
xmas2002 = 1040774400.0
|
||||
|
||||
# These formats are correct for 2002, and possibly future years
|
||||
# This format is the 'standard' as documented at:
|
||||
# http://www.opengroup.org/onlinepubs/007904975/basedefs/xbd_chap08.html
|
||||
# They are also documented in the tzset(3) man page on most Unix
|
||||
# systems.
|
||||
eastern = 'EST+05EDT,M4.1.0,M10.5.0'
|
||||
victoria = 'AEST-10AEDT-11,M10.5.0,M3.5.0'
|
||||
utc='UTC+0'
|
||||
|
||||
org_TZ = environ.get('TZ',None)
|
||||
try:
|
||||
|
||||
# Make sure we can switch to UTC time and results are correct
|
||||
# Note that unknown timezones default to UTC.
|
||||
for tz in ('UTC','GMT','Luna/Tycho'):
|
||||
environ['TZ'] = 'US/Eastern'
|
||||
time.tzset()
|
||||
environ['TZ'] = tz
|
||||
time.tzset()
|
||||
self.failUnlessEqual(
|
||||
time.gmtime(xmas2002),time.localtime(xmas2002)
|
||||
)
|
||||
self.failUnlessEqual(time.timezone,time.altzone)
|
||||
self.failUnlessEqual(time.daylight,0)
|
||||
self.failUnlessEqual(time.timezone,0)
|
||||
self.failUnlessEqual(time.altzone,0)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst,0)
|
||||
# Note that altzone is undefined in UTC, as there is no DST
|
||||
environ['TZ'] = eastern
|
||||
time.tzset()
|
||||
environ['TZ'] = utc
|
||||
time.tzset()
|
||||
self.failUnlessEqual(
|
||||
time.gmtime(xmas2002), time.localtime(xmas2002)
|
||||
)
|
||||
self.failUnlessEqual(time.daylight, 0)
|
||||
self.failUnlessEqual(time.timezone, 0)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst, 0)
|
||||
|
||||
# Make sure we can switch to US/Eastern
|
||||
environ['TZ'] = 'US/Eastern'
|
||||
environ['TZ'] = eastern
|
||||
time.tzset()
|
||||
self.failIfEqual(time.gmtime(xmas2002),time.localtime(xmas2002))
|
||||
self.failUnlessEqual(time.tzname,('EST','EDT'))
|
||||
self.failUnlessEqual(len(time.tzname),2)
|
||||
self.failUnlessEqual(time.daylight,1)
|
||||
self.failUnlessEqual(time.timezone,18000)
|
||||
self.failUnlessEqual(time.altzone,14400)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst,0)
|
||||
self.failUnlessEqual(len(time.tzname),2)
|
||||
self.failIfEqual(time.gmtime(xmas2002), time.localtime(xmas2002))
|
||||
self.failUnlessEqual(time.tzname, ('EST', 'EDT'))
|
||||
self.failUnlessEqual(len(time.tzname), 2)
|
||||
self.failUnlessEqual(time.daylight, 1)
|
||||
self.failUnlessEqual(time.timezone, 18000)
|
||||
self.failUnlessEqual(time.altzone, 14400)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst, 0)
|
||||
self.failUnlessEqual(len(time.tzname), 2)
|
||||
|
||||
# Now go to the southern hemisphere. We want somewhere all OS's
|
||||
# know about that has DST.
|
||||
environ['TZ'] = 'Australia/Melbourne'
|
||||
# Now go to the southern hemisphere.
|
||||
environ['TZ'] = victoria
|
||||
time.tzset()
|
||||
self.failIfEqual(time.gmtime(xmas2002),time.localtime(xmas2002))
|
||||
self.failUnless(time.tzname[0] in ('EST','AEST'))
|
||||
self.failUnless(time.tzname[1] in ('EST','EDT','AEDT'))
|
||||
self.failUnlessEqual(len(time.tzname),2)
|
||||
self.failUnlessEqual(time.daylight,1)
|
||||
self.failUnlessEqual(time.timezone,-36000)
|
||||
self.failUnlessEqual(time.altzone,-39600)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst,1)
|
||||
self.failIfEqual(time.gmtime(xmas2002), time.localtime(xmas2002))
|
||||
self.failUnless(time.tzname[0] == 'AEST', str(time.tzname[0]))
|
||||
self.failUnless(time.tzname[1] == 'AEDT', str(time.tzname[1]))
|
||||
self.failUnlessEqual(len(time.tzname), 2)
|
||||
self.failUnlessEqual(time.daylight, 1)
|
||||
self.failUnlessEqual(time.timezone, -36000)
|
||||
self.failUnlessEqual(time.altzone, -39600)
|
||||
self.failUnlessEqual(time.localtime(xmas2002).tm_isdst, 1)
|
||||
|
||||
# Get some times from a timezone that isn't wallclock timezone
|
||||
del environ['TZ']
|
||||
time.tzset()
|
||||
if time.timezone == 0:
|
||||
environ['TZ'] = 'US/Eastern'
|
||||
else:
|
||||
environ['TZ'] = 'UTC'
|
||||
time.tzset()
|
||||
nonlocal = time.localtime(xmas2002)
|
||||
|
||||
# Then the same time in wallclock timezone
|
||||
del environ['TZ']
|
||||
time.tzset()
|
||||
local = time.localtime(xmas2002)
|
||||
|
||||
# And make sure they arn't the same
|
||||
self.failIfEqual(local,nonlocal)
|
||||
|
||||
# Do some basic sanity checking after wallclock time set
|
||||
self.failUnlessEqual(len(time.tzname),2)
|
||||
time.daylight
|
||||
time.timezone
|
||||
time.altzone
|
||||
finally:
|
||||
# Repair TZ environment variable in case any other tests
|
||||
# rely on it.
|
||||
|
|
@ -136,6 +118,7 @@ def test_tzset(self):
|
|||
environ['TZ'] = org_TZ
|
||||
elif environ.has_key('TZ'):
|
||||
del environ['TZ']
|
||||
time.tzset()
|
||||
|
||||
|
||||
def test_main():
|
||||
|
|
|
|||
10
configure
vendored
10
configure
vendored
|
|
@ -1,5 +1,5 @@
|
|||
#! /bin/sh
|
||||
# From configure.in Revision: 1.398 .
|
||||
# From configure.in Revision: 1.400 .
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.53 for python 2.3.
|
||||
#
|
||||
|
|
@ -908,7 +908,7 @@ esac
|
|||
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
|
||||
# absolute.
|
||||
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
|
||||
ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
|
||||
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
|
||||
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
|
||||
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
|
||||
|
||||
|
|
@ -16741,10 +16741,10 @@ int main()
|
|||
int eastern_hour;
|
||||
time_t now;
|
||||
now = time((time_t*)NULL);
|
||||
putenv("TZ=GMT");
|
||||
putenv("TZ=UTC+0");
|
||||
tzset();
|
||||
gmt_hour = localtime(&now)->tm_hour;
|
||||
putenv("TZ=US/Eastern");
|
||||
putenv("TZ=EST+5EDT,M4.1.0,M10.5.0");
|
||||
tzset();
|
||||
eastern_hour = localtime(&now)->tm_hour;
|
||||
if (eastern_hour == gmt_hour)
|
||||
|
|
@ -17828,7 +17828,7 @@ esac
|
|||
# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
|
||||
# absolute.
|
||||
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
|
||||
ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
|
||||
ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
|
||||
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
|
||||
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
|
||||
|
||||
|
|
|
|||
|
|
@ -2552,10 +2552,10 @@ int main()
|
|||
int eastern_hour;
|
||||
time_t now;
|
||||
now = time((time_t*)NULL);
|
||||
putenv("TZ=GMT");
|
||||
putenv("TZ=UTC+0");
|
||||
tzset();
|
||||
gmt_hour = localtime(&now)->tm_hour;
|
||||
putenv("TZ=US/Eastern");
|
||||
putenv("TZ=EST+5EDT,M4.1.0,M10.5.0");
|
||||
tzset();
|
||||
eastern_hour = localtime(&now)->tm_hour;
|
||||
if (eastern_hour == gmt_hour)
|
||||
|
|
|
|||
Loading…
Reference in a new issue