diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 15:37:19 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-04 15:55:28 -0300 |
| commit | 479bd52af8fed95ca2d6893f20fb3cc6e11e7f5c (patch) | |
| tree | 1e4ea36f47e34e49cd4f0d3fd872264cd1ec723f /activesupport | |
| parent | 21f02f34851f58103fc03e852e0315afdb6f74e0 (diff) | |
| download | rails-479bd52af8fed95ca2d6893f20fb3cc6e11e7f5c.tar.gz rails-479bd52af8fed95ca2d6893f20fb3cc6e11e7f5c.tar.bz2 rails-479bd52af8fed95ca2d6893f20fb3cc6e11e7f5c.zip | |
Remove unneeded Time patch to support Ruby 1.9
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/marshal.rb | 31 |
2 files changed, 2 insertions, 30 deletions
diff --git a/activesupport/lib/active_support/core_ext/time.rb b/activesupport/lib/active_support/core_ext/time.rb index 32cffe237d..72c3234630 100644 --- a/activesupport/lib/active_support/core_ext/time.rb +++ b/activesupport/lib/active_support/core_ext/time.rb @@ -1,5 +1,4 @@ require 'active_support/core_ext/time/acts_like' require 'active_support/core_ext/time/calculations' require 'active_support/core_ext/time/conversions' -require 'active_support/core_ext/time/marshal' require 'active_support/core_ext/time/zones' diff --git a/activesupport/lib/active_support/core_ext/time/marshal.rb b/activesupport/lib/active_support/core_ext/time/marshal.rb index 497c4c3fb8..467bad1726 100644 --- a/activesupport/lib/active_support/core_ext/time/marshal.rb +++ b/activesupport/lib/active_support/core_ext/time/marshal.rb @@ -1,30 +1,3 @@ -# Ruby 1.9.2 adds utc_offset and zone to Time, but marshaling only -# preserves utc_offset. Preserve zone also, even though it may not -# work in some edge cases. -if Time.local(2010).zone != Marshal.load(Marshal.dump(Time.local(2010))).zone - class Time - class << self - alias_method :_load_without_zone, :_load - def _load(marshaled_time) - time = _load_without_zone(marshaled_time) - time.instance_eval do - if zone = defined?(@_zone) && remove_instance_variable('@_zone') - ary = to_a - ary[0] += subsec if ary[0] == sec - ary[-1] = zone - utc? ? Time.utc(*ary) : Time.local(*ary) - else - self - end - end - end - end +require 'active_support/deprecation' - alias_method :_dump_without_zone, :_dump - def _dump(*args) - obj = dup - obj.instance_variable_set('@_zone', zone) - obj.send :_dump_without_zone, *args - end - end -end +ActiveSupport::Deprecation.warn("This is deprecated and will be removed in Rails 5.1 with no replacement.") |