summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2011-02-25 21:09:19 +0000
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-25 14:08:10 -0800
commit577439915f524907a3756d447f165268bc46a968 (patch)
tree667465f4524599c6d354d136497e202a5d7215ae
parent217b8e5c255c8123751173e61db75d821e3d3eb1 (diff)
downloadpsych-577439915f524907a3756d447f165268bc46a968.zip
add support for time strings whose timezone format is (+/-)hhmm
-rw-r--r--lib/psych/scalar_scanner.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/psych/scalar_scanner.rb b/lib/psych/scalar_scanner.rb
index e1e59d3..f7aaea7 100644
--- a/lib/psych/scalar_scanner.rb
+++ b/lib/psych/scalar_scanner.rb
@@ -90,7 +90,7 @@ module Psych
return time if 'Z' == md[3]
return Time.at(time.to_i, us) unless md[3]
- tz = md[3].split(':').map { |digit| Integer(digit, 10) }
+ tz = md[3].match(/^([+\-]?\d{1,2})\:?(\d{1,2})?$/)[1..-1].compact.map { |digit| Integer(digit, 10) }
offset = tz.first * 3600
if offset < 0