diff options
Diffstat (limited to 'ext/tk/lib/multi-tk.rb')
| -rw-r--r-- | ext/tk/lib/multi-tk.rb | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/ext/tk/lib/multi-tk.rb b/ext/tk/lib/multi-tk.rb index 5129a6e862..c23c246551 100644 --- a/ext/tk/lib/multi-tk.rb +++ b/ext/tk/lib/multi-tk.rb @@ -1265,14 +1265,6 @@ class MultiTkIp ###################################### def initialize(master, safeip=true, keys={}) - if $SAFE >= 4 - fail SecurityError, "cannot create a new interpreter at level #{$SAFE}" - end - - if safeip == nil && $SAFE >= 2 - fail SecurityError, "cannot create a master-ip at level #{$SAFE}" - end - if master.deleted? && safeip == nil fail RuntimeError, "cannot create a slave of a deleted interpreter" end @@ -1307,7 +1299,7 @@ class MultiTkIp name, safe, safe_opts, tk_opts = _parse_slaveopts(keys) - safe = 4 if safe && !safe.kind_of?(Fixnum) + safe = 1 if safe && !safe.kind_of?(Fixnum) @safe_base = false @@ -1423,7 +1415,7 @@ class MultiTkIp safe = master.safe_level if safe < master.safe_level @safe_level = [safe] else - @safe_level = [4] + @safe_level = [1] end else @interp, @ip_name = master.__create_trusted_slave_obj(name, tk_opts) @@ -1615,7 +1607,7 @@ class << MultiTkIp end alias new_trusted_slave new_slave - def new_safe_slave(safe=4, keys={}, &blk) + def new_safe_slave(safe=1, keys={}, &blk) if safe.kind_of?(Hash) keys = safe elsif safe.kind_of?(Integer) @@ -2754,13 +2746,9 @@ class MultiTkIp if @wait_on_mainloop[0] begin @wait_on_mainloop[1] += 1 - if $SAFE >= 4 - _receiver_mainloop(check_root).join - else - @cmd_queue.enq([@system, 'call_mainloop', - Thread.current, check_root]) - Thread.stop - end + @cmd_queue.enq([@system, 'call_mainloop', + Thread.current, check_root]) + Thread.stop rescue MultiTkIp_OK => ret # return value if ret.value.kind_of?(Thread) |