lib/timecop/time_stack_item.rb in timecop-0.5.0 vs lib/timecop/time_stack_item.rb in timecop-0.5.1

@@ -82,11 +82,10 @@
       def utc_offset_to_rational(utc_offset)
         Rational(utc_offset, 24 * 60 * 60)
       end
       
       def parse_time(*args)
-        time_klass = Time
-        time_klass = Time.zone if Time.respond_to? :zone
+        time_klass = Time.respond_to?(:zone) && Time.zone ? Time.zone : Time
         arg = args.shift
         if arg.is_a?(Time) 
           if Timecop.active_support != false && arg.respond_to?(:in_time_zone)
             arg.in_time_zone
           else