ruby-changes:3541
From: ko1@a...
Date: Mon, 14 Jan 2008 09:33:58 +0900 (JST)
Subject: [ruby-changes:3541] tadf - Ruby:r15030 (ruby_1_8): * lib/time.rb: do not reference Time directly from the inside of
tadf 2008-01-14 09:33:29 +0900 (Mon, 14 Jan 2008) New Revision: 15030 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/lib/time.rb Log: * lib/time.rb: do not reference Time directly from the inside of definitions. [ruby-dev:33059] http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15030&r2=15029&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/time.rb?r1=15030&r2=15029&diff_format=u Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 15029) +++ ruby_1_8/ChangeLog (revision 15030) @@ -1,3 +1,8 @@ +Mon Jan 14 09:32:40 2008 Tadayoshi Funaba <tadf@d...> + + * lib/time.rb: do not reference Time directly from the inside of + definitions. [ruby-dev:33059] + Sat Jan 12 18:27:41 2008 Nobuyoshi Nakada <nobu@r...> * eval.c (rb_define_alloc_func, rb_undef_alloc_func): should Index: ruby_1_8/lib/time.rb =================================================================== --- ruby_1_8/lib/time.rb (revision 15029) +++ ruby_1_8/lib/time.rb (revision 15030) @@ -66,7 +66,7 @@ 'N' => -1, 'O' => -2, 'P' => -3, 'Q' => -4, 'R' => -5, 'S' => -6, 'T' => -7, 'U' => -8, 'V' => -9, 'W' => -10, 'X' => -11, 'Y' => -12, } - def zone_offset(zone, year=Time.now.year) + def zone_offset(zone, year=self.now.year) off = nil zone = zone.upcase if /\A([+-])(\d\d):?(\d\d)\z/ =~ zone @@ -75,9 +75,9 @@ off = zone.to_i * 3600 elsif ZoneOffset.include?(zone) off = ZoneOffset[zone] * 3600 - elsif ((t = Time.local(year, 1, 1)).zone.upcase == zone rescue false) + elsif ((t = self.local(year, 1, 1)).zone.upcase == zone rescue false) off = t.utc_offset - elsif ((t = Time.local(year, 7, 1)).zone.upcase == zone rescue false) + elsif ((t = self.local(year, 7, 1)).zone.upcase == zone rescue false) off = t.utc_offset end off @@ -177,7 +177,7 @@ if off year, mon, day, hour, min, sec = apply_offset(year, mon, day, hour, min, sec, off) - t = Time.utc(year, mon, day, hour, min, sec, usec) + t = self.utc(year, mon, day, hour, min, sec, usec) t.localtime if !zone_utc?(zone) t else @@ -236,7 +236,7 @@ # # A failure for Time.parse should be checked, though. # - def parse(date, now=Time.now) + def parse(date, now=self.now) d = Date._parse(date, false) year = d[:year] year = yield(year) if year && block_given? @@ -368,9 +368,9 @@ zone = $8 year, mon, day, hour, min, sec = apply_offset(year, mon, day, hour, min, sec, zone_offset(zone)) - Time.utc(year, mon, day, hour, min, sec, usec) + self.utc(year, mon, day, hour, min, sec, usec) else - Time.local(year, mon, day, hour, min, sec, usec) + self.local(year, mon, day, hour, min, sec, usec) end else raise ArgumentError.new("invalid date: #{date.inspect}") -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/