diff options
| author | Kevin B Kenny <kennykb@acm.org> | 2008-11-30 19:25:45 (GMT) |
|---|---|---|
| committer | Kevin B Kenny <kennykb@acm.org> | 2008-11-30 19:25:45 (GMT) |
| commit | 336831b7a640936c4ab784e96c3c0116fe3b04aa (patch) | |
| tree | 12fea22f154a2af56eb7b8ae0a62c91062558c0b | |
| parent | 4f1e14923d50353097e8f629a8138d1acb8e64a1 (diff) | |
| download | tcl-336831b7a640936c4ab784e96c3c0116fe3b04aa.zip tcl-336831b7a640936c4ab784e96c3c0116fe3b04aa.tar.gz tcl-336831b7a640936c4ab784e96c3c0116fe3b04aa.tar.bz2 | |
* library/clock.tcl (format, ParseClockScanFormat): Added a
[string map] to get rid of namespace delimiters before caching a
scan or format procedure [Bug 2362156].
* tests/clock.test (clock-64.[12]): Added test cases for the bug
that was tickled by a namespace delimiter inside a format string.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | library/clock.tcl | 8 | ||||
| -rw-r--r-- | tests/clock.test | 15 |
3 files changed, 28 insertions, 4 deletions
@@ -1,3 +1,12 @@ +2008-11-30 Kevin B. Kenny <kennykb@acm.org> + + * library/clock.tcl (format, ParseClockScanFormat): Added a + [string map] to get rid of namespace delimiters before caching a + scan or format procedure [Bug 2362156]. + * tests/clock.test (clock-64.[12]): Added test cases for the bug + that was tickled by a namespace delimiter inside a format string. + + 2008-11-25 Andreas Kupries <andreask@activestate.com> * generic/tclIO.c (TclFinalizeIOSubsystem): Applied Alexandre diff --git a/library/clock.tcl b/library/clock.tcl index b3cf9db..8b371d9 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.1 2008/11/01 15:03:32 das Exp $ +# RCS: @(#) $Id: clock.tcl,v 1.47.2.2 2008/11/30 19:25:46 kennykb Exp $ # #---------------------------------------------------------------------- @@ -687,7 +687,8 @@ proc ::tcl::clock::format { args } { # name in the 'FormatProc' array to avoid losing its internal # representation, which contains the name resolution. - set procName ::tcl::clock::formatproc'$format'$locale + set procName formatproc'$format'$locale + set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName] if {[info exists FormatProc($procName)]} { set procName $FormatProc($procName) } else { @@ -1531,7 +1532,8 @@ proc ::tcl::clock::ParseClockScanFormat {formatString locale} { # Check whether the format has been parsed previously, and return # the existing recognizer if it has. - set procName [namespace current]::scanproc'$formatString'$locale + set procName scanproc'$formatString'$locale + set procName [namespace current]::[string map {: {\:} \\ {\\}} $procName] if { [namespace which $procName] != {} } { return $procName } diff --git a/tests/clock.test b/tests/clock.test index cb7c4a1..cdb577f 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.2 2008/06/17 02:22:26 kennykb Exp $ +# RCS: @(#) $Id: clock.test,v 1.83.2.3 2008/11/30 19:25:46 kennykb Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { package require tcltest 2 @@ -36644,6 +36644,19 @@ test clock-63.1 {Incorrect use of internal ConvertLocalToUTC command} {*}{ -result {key "localseconds" not found in dictionary} } +test clock-64.1 {:: in format string [Bug 2362156]} {*}{ + -body { + clock scan 2001-02-03::04:05:06 -gmt 1 -format %Y-%m-%d::%H:%M:%S + } + -result 981173106 +} +test clock-64.2 {:: in format string [Bug 2362156]} {*}{ + -body { + clock format 981173106 -gmt 1 -format %Y-%m-%d::%H:%M:%S + } + -result 2001-02-03::04:05:06 +} + # cleanup namespace delete ::testClock |