diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-28 15:19:38 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-28 15:19:38 +0000 |
| commit | 71fed537ac6c989bded172eee185c1fc4ed84ad4 (patch) | |
| tree | c281264d59820f7d61a26e05f02cb0032446347e | |
| parent | 3e2ff59f10e606bfc07ab9cb1fd488f024474e8d (diff) | |
| download | ruby-71fed537ac6c989bded172eee185c1fc4ed84ad4.tar.gz | |
time.rb: fix parsing time zone in iso8601
* lib/time.rb (Time.xmlschema): a colon in time zone designator
can be omitted. [ruby-core:87277] [Bug #14790]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/time.rb | 2 | ||||
| -rw-r--r-- | test/test_time.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/time.rb b/lib/time.rb index e2e878d731..d945e876ae 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -571,7 +571,7 @@ class Time T (\d\d):(\d\d):(\d\d) (\.\d+)? - (Z|[+-]\d\d:\d\d)? + (Z|[+-]\d\d:?\d\d)? \s*\z/ix =~ date year = $1.to_i mon = $2.to_i diff --git a/test/test_time.rb b/test/test_time.rb index 9d7c976abf..d01d74eb52 100644 --- a/test/test_time.rb +++ b/test/test_time.rb @@ -105,6 +105,7 @@ class TestTimeExtension < Test::Unit::TestCase # :nodoc: t = Time.utc(1996, 12, 20, 0, 39, 57) s = "1996-12-19T16:39:57-08:00" assert_equal(t, Time.__send__(method, s)) + assert_equal(t, Time.__send__(method, s.sub(/:(?=00\z)/, ''))) # There is no way to generate time string with arbitrary timezone. s = "1996-12-20T00:39:57Z" assert_equal(t, Time.__send__(method, s)) |