← Back to branch summary

~ubuntu-branches/ubuntu/quantal/ruby1.9.1/quantal

« back to all changes in this revision

Viewing changes to ext/psych/lib/psych/scalar_scanner.rb

  • Committer: Bazaar Package Importer
  • Author(s): Lucas Nussbaum
  • Date: 2011-09-24 19:16:17 UTC
  • mfrom: (1.1.8 upstream) (13.1.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20110924191617-o1qz4rcmqjot8zuy
Tags: 1.9.3~rc1-1
http://bugs.debian.org/639959
* New upstream release: 1.9.3 RC1.
  + Includes load.c fixes. Closes: #639959.
* Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ext/psych/lib/psych/scalar_scanner.rb
80
80
    def parse_time string
81
81
      date, time = *(string.split(/[ tT]/, 2))
82
82
      (yy, m, dd) = date.split('-').map { |x| x.to_i }
83
 
      md = time.match(/(\d+:\d+:\d+)(\.\d*)?\s*(Z|[-+]\d+(:\d\d)?)?/)
 
83
      md = time.match(/(\d+:\d+:\d+)(?:\.(\d*))?\s*(Z|[-+]\d+(:\d\d)?)?/)
84
84
 
85
85
      (hh, mm, ss) = md[1].split(':').map { |x| x.to_i }
86
 
      us = (md[2] ? Rational(md[2].sub(/^\./, '0.')) : 0) * 1000000
 
86
      us = (md[2] ? Rational("0.#{md[2]}") : 0) * 1000000
87
87
 
88
88
      time = Time.utc(yy, m, dd, hh, mm, ss, us)
89
89