* ext/tk/tcltklib.c: removed deprecated safe level.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 10d740d8cf..e0a1c4fd12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jul  6 17:59:11 2015  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* ext/tk/tcltklib.c: removed deprecated safe level.
+
 Mon Jul  6 17:16:37 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* method.h, proc.c (rb_method_entry_location): make it static
diff --git a/ext/tk/tcltklib.c b/ext/tk/tcltklib.c
index f082d3922f..afcee3b072 100644
--- a/ext/tk/tcltklib.c
+++ b/ext/tk/tcltklib.c
@@ -3039,7 +3039,7 @@ lib_do_one_event_core(argc, argv, self, is_ip)
         flags = FIX2INT(vflags);
     }
 
-    if (rb_safe_level() >= 4 || (rb_safe_level() >=1 && OBJ_TAINTED(vflags))) {
+    if (rb_safe_level() >=1 && OBJ_TAINTED(vflags)) {
       flags |= TCL_DONT_WAIT;
     }
 
@@ -3750,7 +3750,7 @@ ip_RubyExitCommand(clientData, interp, argc, argv)
 
     Tcl_ResetResult(interp);
 
-    if (rb_safe_level() >= 4 || Tcl_IsSafe(interp)) {
+    if (Tcl_IsSafe(interp)) {
 	if (!Tcl_InterpDeleted(interp)) {
 	  ip_finalize(interp);
 
@@ -6125,13 +6125,6 @@ ip_init(argc, argv, self)
     int with_tk = 1;
     Tk_Window mainWin = (Tk_Window)NULL;
 
-    /* security check */
-    if (rb_safe_level() >= 4) {
-        rb_raise(rb_eSecurityError,
-                 "Cannot create a TclTkIp object at level %d",
-                 rb_safe_level());
-    }
-
     /* create object */
     TypedData_Get_Struct(self, struct tcltkip, &tcltkip_type, ptr);
     if (DATA_PTR(self)) {