time_stack_item.rb in timecop-0.4.4

- old
+ new

@@ -80,12 +80,12 @@
       
       def parse_time(*args)
         time_klass = Time
         time_klass = Time.zone if Time.respond_to? :zone
         arg = args.shift
-        if arg.is_a?(Time)
-          if arg.respond_to?(:in_time_zone)
+        if arg.is_a?(Time) 
+          if Timecop.active_support != false && arg.respond_to?(:in_time_zone)
             arg.in_time_zone
           else
             arg.getlocal
           end
         elsif Object.const_defined?(:DateTime) && arg.is_a?(DateTime)
@@ -97,10 +97,10 @@
         elsif args.empty? && arg.kind_of?(Integer)
           Time.now + arg
         elsif arg.nil?
           Time.now
         else
-          if Time.respond_to?(:parse) && arg.is_a?(String)
+          if arg.is_a?(String) && Timecop.active_support != false && Time.respond_to?(:parse)
             Time.parse(arg)
           else
             # we'll just assume it's a list of y/m/d/h/m/s
             year   = arg        || 2000
             month  = args.shift || 1