diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 15:07:45 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-10-09 15:07:45 +0000 |
| commit | 8b73cefeda2181b64695ac14eb12f0d62a3f667d (patch) | |
| tree | 5ad3212ec2ac5bb58ec0b12999a5cade38b512ce /lib | |
| parent | 9eecfd5c2f051088c1d6267deb1dfac172458a7f (diff) | |
merge revision(s) 43177,43191: [Backport #8991]
* lib/time.rb (Time.strptime): Use :offset.
Patch by Felipe Contreras. [ruby-core:57694]
* lib/time.rb (Time.strptime): Time.strptime('0', '%s') returns local
time Time object as Ruby 2.0 and before.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@43221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/time.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/time.rb b/lib/time.rb index 977010087e..12c2b30e25 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -393,7 +393,11 @@ class Time d = Date._strptime(date, format) raise ArgumentError, "invalid strptime format - `#{format}'" unless d if seconds = d[:seconds] - Time.at(seconds) + if offset = d[:offset] + Time.at(seconds).localtime(offset) + else + Time.at(seconds) + end else year = d[:year] year = yield(year) if year && block_given? |