From 5b561fb37ebb37374b27e4b6f1eba0c5f26b5733 Mon Sep 17 00:00:00 2001 From: sonots Date: Tue, 19 Apr 2016 04:20:48 +0000 Subject: * lib/time.rb: revert r54167 because it would break backward compatibilities, and it is documented that Time.parse does not take into account time zone abbreations other than ones described in RFC 822 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54647 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/time.rb | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) (limited to 'lib/time.rb') diff --git a/lib/time.rb b/lib/time.rb index 61e973a461..69e524fd61 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -249,18 +249,14 @@ class Time end private :apply_offset - def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, offset, now) + def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, now) if !year && !mon && !day && !hour && !min && !sec && !sec_fraction raise ArgumentError, "no time information in #{date.inspect}" end + off_year = year || now.year off = nil - if offset - off = offset - else - off_year = year || now.year - off = zone_offset(zone, off_year) if zone - end + off = zone_offset(zone, off_year) if zone if off now = now.getlocal(off) if now.utc_offset != off @@ -291,10 +287,8 @@ class Time sec ||= 0 usec ||= 0 - off = nil - if offset - off = offset - elsif year != off_year + if year != off_year + off = nil off = zone_offset(zone, year) if zone end @@ -369,7 +363,7 @@ class Time d = Date._parse(date, comp) year = d[:year] year = yield(year) if year && !comp - make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], d[:offset], now) + make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) end # @@ -447,7 +441,7 @@ class Time else year = d[:year] year = yield(year) if year && block_given? - t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], d[:offset], now) + t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], now) end t end -- cgit v1.2.3