Try Time.find_timezone to load

nobu · nobu · commit fe08f99e9388 · 2018-11-28T14:08:30.000Z
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/test/ruby/test_time_tz.rb b/test/ruby/test_time_tz.rb
@@ -542,6 +542,7 @@ def subtest_marshal(time_class, tz, tzname, abbr, utc_offset)
     assert_equal(t, t2)
     assert_equal(t.utc_offset, t2.utc_offset)
     assert_equal(t.utc_offset, (t2+1).utc_offset)
+    assert_instance_of(t.zone.class, t2.zone)
   end
 
   ZONES = {
diff --git a/time.c b/time.c
@@ -38,7 +38,7 @@
 static ID id_divmod, id_submicro, id_nano_num, id_nano_den, id_offset, id_zone;
 static ID id_quo, id_div;
 static ID id_nanosecond, id_microsecond, id_millisecond, id_nsec, id_usec;
-static ID id_local_to_utc, id_utc_to_local;
+static ID id_local_to_utc, id_utc_to_local, id_find_timezone;
 static ID id_year, id_mon, id_mday, id_hour, id_min, id_sec, id_isdst, id_name;
 
 #ifndef TM_IS_TIME
@@ -2210,6 +2210,14 @@ zone_localtime(VALUE zone, VALUE time)
     return 1;
 }
 
+static VALUE
+find_timezone(VALUE time, VALUE zone)
+{
+    VALUE klass = CLASS_OF(time);
+
+    return rb_check_funcall_default(klass, id_find_timezone, 1, &zone, Qnil);
+}
+
 static VALUE
 time_init_1(int argc, VALUE *argv, VALUE time)
 {
@@ -5016,7 +5024,8 @@ end_submicro: ;
 	time_fixoff(time);
     }
     if (!NIL_P(zone)) {
-	zone = rb_fstring(zone);
+        VALUE z = find_timezone(time, zone);
+        zone = NIL_P(z) ? rb_fstring(zone) : RB_TYPE_P(z, T_STRING) ? rb_fstring(z) : z;
 	tobj->vtm.zone = zone;
     }
 
@@ -5403,6 +5412,11 @@ rb_time_zone_abbreviation(VALUE zone, VALUE time)
  *  object are not able to dump by Marshal.
  *
  *  The +abbr+ method is used by '%Z' in #strftime.
+ *
+ *  === Auto conversion to Timezone
+ *
+ *  At loading marshaled data, a timezone name will be converted to a timezone
+ *  object by +find_timezone+ class method, if the method is defined.
  */
 
 void
@@ -5434,6 +5448,7 @@ Init_Time(void)
     id_sec = rb_intern("sec");
     id_isdst = rb_intern("isdst");
     id_name = rb_intern("name");
+    id_find_timezone = rb_intern("find_timezone");
 
     rb_cTime = rb_define_class("Time", rb_cObject);
     rb_include_module(rb_cTime, rb_mComparable);
