From 50fd0278bae0fd18a016e5c0dde63513c2cff088 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Tue, 25 May 2010 06:54:28 -0600 Subject: [PATCH] Fixing an innoculous test case failure I introduced, by override the platform's time zone. Relaxing the contract on date->string to accord with previous documentation. Changing web-server example to use more restrictive contract Please include in 5.0 --- collects/mzlib/date.rkt | 2 +- collects/tests/racket/date.rktl | 4 +++- .../default-web-root/htdocs/servlets/examples/count.rkt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/collects/mzlib/date.rkt b/collects/mzlib/date.rkt index 4767898f09..8e78a0cea0 100644 --- a/collects/mzlib/date.rkt +++ b/collects/mzlib/date.rkt @@ -8,7 +8,7 @@ (provide/contract [current-date (-> date?)] [date->seconds (date? . -> . exact-integer?)] - [date->string ((date?) (boolean?) . ->* . string?)] + [date->string ((date?) (any/c) . ->* . string?)] [date-display-format (parameter/c (symbols 'american 'chinese 'german 'indian 'irish 'julian 'iso-8601 'rfc2822))] [find-seconds ((integer-in 0 61) (integer-in 0 59) diff --git a/collects/tests/racket/date.rktl b/collects/tests/racket/date.rktl index 5c1e368a2a..5e731618a6 100644 --- a/collects/tests/racket/date.rktl +++ b/collects/tests/racket/date.rktl @@ -21,7 +21,9 @@ ; date->string (let* ([secs (find-seconds 1 2 3 4 5 2006)] - [d (seconds->date secs)]) + [d-some-tz (seconds->date secs)] + [d (struct-copy date d-some-tz + [time-zone-offset -21600])]) (define (test-string fmt time? result) (test (parameterize ([date-display-format fmt]) (date->string d time?)) diff --git a/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt b/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt index 73b08908c6..373c74193b 100644 --- a/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt +++ b/collects/web-server/default-web-root/htdocs/servlets/examples/count.rkt @@ -4,7 +4,7 @@ (define interface-version 'v1) (define timeout +inf.0) (define count 0) -(define a-date (date->string (seconds->date (current-seconds)) 'time-too)) +(define a-date (date->string (seconds->date (current-seconds)) #t)) (define (start initial-request) (define other-count 0)