summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2008-12-11 14:05:28 (GMT)
committernijtmans <nijtmans>2008-12-11 14:05:28 (GMT)
commitff52644df61dbb4a08a241e6c703dedc3004c120 (patch)
treeefe9d1227e3d4c75fb2a7f57c655eb710223f298
parentb8a91b8ff2f6dc709bfde543618e255f4df67831 (diff)
downloadtcl-ff52644df61dbb4a08a241e6c703dedc3004c120.zip
tcl-ff52644df61dbb4a08a241e6c703dedc3004c120.tar.gz
tcl-ff52644df61dbb4a08a241e6c703dedc3004c120.tar.bz2
Fallback to European time zone DST rules, when the timezone is
between 0 and -12 [Bug 2207436].
-rw-r--r--ChangeLog7
-rw-r--r--library/clock.tcl33
-rw-r--r--tests/clock.test24
3 files changed, 56 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 22492a8..d622cfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-11 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * library/clock.tcl (ProcessPosixTimeZone): Fallback to
+ European time zone DST rules, when the timezone is
+ between 0 and -12 [Bug 2207436].
+ * tests/clock.test (clock-64.[12]): Test cases for [Bug 2207436]
+
2008-12-10 Kevin B. Kenny <kennykb@acm.org>
* library/tzdata/*: Update from Olson's tzdata2008i.
diff --git a/library/clock.tcl b/library/clock.tcl
index 8b371d9..da63faa 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -13,7 +13,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: clock.tcl,v 1.47.2.2 2008/11/30 19:25:46 kennykb Exp $
+# RCS: @(#) $Id: clock.tcl,v 1.47.2.3 2008/12/11 14:05:28 nijtmans Exp $
#
#----------------------------------------------------------------------
@@ -3885,23 +3885,42 @@ proc ::tcl::clock::ProcessPosixTimeZone { z } {
* $dstSignum }]
}
- # Fill in defaults for US DST rules
+ # Fill in defaults for European or US DST rules
if { [dict get $z startDayOfYear] eq {}
&& [dict get $z startMonth] eq {} } {
+ if {($stdHours>=0) && ($stdHours<=12)} {
+ dict set z startWeekOfMonth 5
+ if {$stdHours>1} {
+ dict set z startHours 2
+ } else {
+ dict set z startHours [expr {$stdHours+1}]
+ }
+ } else {
+ dict set z startWeekOfMonth 2
+ dict set z startHours 2
+ }
dict set z startMonth 3
- dict set z startWeekOfMonth 2
dict set z startDayOfWeek 0
- dict set z startHours 2
dict set z startMinutes 0
dict set z startSeconds 0
}
if { [dict get $z endDayOfYear] eq {}
&& [dict get $z endMonth] eq {} } {
- dict set z endMonth 11
- dict set z endWeekOfMonth 1
+ if {($stdHours>=0) && ($stdHours<=12)} {
+ dict set z endMonth 10
+ dict set z endWeekOfMonth 5
+ if {$stdHours>1} {
+ dict set z endHours 3
+ } else {
+ dict set z endHours [expr {$stdHours+2}]
+ }
+ } else {
+ dict set z endMonth 11
+ dict set z endWeekOfMonth 1
+ dict set z endHours 2
+ }
dict set z endDayOfWeek 0
- dict set z endHours 2
dict set z endMinutes 0
dict set z endSeconds 0
}
diff --git a/tests/clock.test b/tests/clock.test
index cdb577f..8cc5bdb 100644
--- a/tests/clock.test
+++ b/tests/clock.test
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: clock.test,v 1.83.2.3 2008/11/30 19:25:46 kennykb Exp $
+# RCS: @(#) $Id: clock.test,v 1.83.2.4 2008/12/11 14:05:28 nijtmans Exp $
if {[lsearch [namespace children] ::tcltest] == -1} {
package require tcltest 2
@@ -36083,6 +36083,28 @@ test clock-52.1 {Posix timezone and conversion on last Sunday} {
set result
} {01:59:59 01:59:59 03:00:00 03:00:00}
+test clock-52.2 {correct conversion of times in Europe} {
+ # [Bug 2207436]
+ set result {}
+ foreach t [list 1206838799 1206838800 1224982799 1224982800] {
+ lappend result [clock format $t -format %H:%M:%S \
+ -timezone MET-1METDST]
+ lappend result [clock format $t -format %H:%M:%S \
+ -timezone MET0METDST]
+ }
+ set result
+} {01:59:59 00:59:59 03:00:00 02:00:00 02:59:59 01:59:59 02:00:00 01:00:00}
+
+test clock-52.3 {correct conversion of times in Russia} {
+ # [Bug 2207436]
+ set result {}
+ foreach t [list 1206799199 1206799200 1224943199 1224943200] {
+ lappend result [clock format $t -format %H:%M:%S \
+ -timezone WST-12WSTDST]
+ }
+ set result
+} {01:59:59 03:00:00 02:59:59 02:00:00}
+
# Regression test for Bug # 1505383
test clock-53.1 {%EC %Ey} {