diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-20 01:03:18 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-20 01:03:18 +0000 |
| commit | 90048176ccde574cb315437faecf468f45370dfd (patch) | |
| tree | 07b8b3c2e4236429e5ac1764211db8454420599c /lib/time.rb | |
| parent | f16f0441d681dd9d2e09631fd068268a63fe1f3b (diff) | |
Make Time.parse respect timezone offset seconds
DateTime.parse handles them correctly, and DateTime.parse.to_time
results in the correct time. Time.parse doesn't handle them
correctly because Time.zone_offset uses a different regexp that
only considers hours and minutes, not seconds.
[ruby-core:83400] [Bug #14034]
From: Jeremy Evans <code@jeremyevans.net>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/time.rb')
| -rw-r--r-- | lib/time.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/time.rb b/lib/time.rb index 5179e9fee4..bb5d0aac38 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -134,8 +134,8 @@ class Time def zone_offset(zone, year=self.now.year) off = nil zone = zone.upcase - if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone - off = ($1 == '-' ? -1 : 1) * ($2.to_i * 60 + $3.to_i) * 60 + if /\A([+-])(\d\d)(:?)(\d\d)(?:\3(\d\d))?\z/ =~ zone + off = ($1 == '-' ? -1 : 1) * (($2.to_i * 60 + $4.to_i) * 60 + $5.to_i) elsif /\A[+-]\d\d\z/ =~ zone off = zone.to_i * 3600 elsif ZoneOffset.include?(zone) |