From 84db1a44b8cd86c1a201b578e07184474e5701d9 Mon Sep 17 00:00:00 2001 From: tcal-x Date: Fri, 19 May 2023 14:47:59 -0700 Subject: [PATCH] "file.exists?" was deprecated with Ruby 2.2. Use "file.exist?" instead. https://stackoverflow.com/questions/14301088/difference-between-fileexist-and-fileexists Signed-off-by: tcal-x --- scripts/extract_user_doc.rb | 2 +- testdata/buddies/buddies.rb | 18 +++++++++--------- testdata/klayout_main/main.rb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/scripts/extract_user_doc.rb b/scripts/extract_user_doc.rb index d83b99a78..ee3aeba7a 100755 --- a/scripts/extract_user_doc.rb +++ b/scripts/extract_user_doc.rb @@ -231,7 +231,7 @@ hs.urls.each do |url| t = HEADER + xml2html(t) + TAIL tt = nil - if File.exists?(fn) + if File.exist?(fn) File.open(fn, "rb") { |f| tt = f.read } end diff --git a/testdata/buddies/buddies.rb b/testdata/buddies/buddies.rb index 0812e7f02..3577a1855 100644 --- a/testdata/buddies/buddies.rb +++ b/testdata/buddies/buddies.rb @@ -72,15 +72,15 @@ class Buddies_TestClass < TestBase else out_file = File.join($ut_testtmp, "out_" + bin) end - if File.exists?(out_file) + if File.exist?(out_file) File.unlink(out_file) end - assert_equal(File.exists?(out_file), false) + assert_equal(File.exist?(out_file), false) in_file = File.join(File.dirname(__FILE__), "test1.gds") log = bin + "\n" + `#{self.buddy_bin(bin)} #{in_file} #{out_file} 2>&1` - assert_equal(File.exists?(out_file), true) + assert_equal(File.exist?(out_file), true) assert_equal(log, bin + "\n") File.open(out_file, "rb") do |file| @@ -96,16 +96,16 @@ class Buddies_TestClass < TestBase def test_strmxor out_file = File.join($ut_testtmp, "out") - if File.exists?(out_file) + if File.exist?(out_file) File.unlink(out_file) end - assert_equal(File.exists?(out_file), false) + assert_equal(File.exist?(out_file), false) in_file1 = File.join(File.dirname(__FILE__), "test1.gds") in_file2 = File.join(File.dirname(__FILE__), "test2.gds") log = "strmxor\n" + `#{self.buddy_bin("strmxor")} #{in_file1} #{in_file2} #{out_file} 2>&1` - assert_equal(File.exists?(out_file), true) + assert_equal(File.exist?(out_file), true) assert_equal(log, <<"END") strmxor Warning: Layer 1/0 is not present in second layout, but in first @@ -141,15 +141,15 @@ END def test_strmclip out_file = File.join($ut_testtmp, "out") - if File.exists?(out_file) + if File.exist?(out_file) File.unlink(out_file) end - assert_equal(File.exists?(out_file), false) + assert_equal(File.exist?(out_file), false) in_file = File.join(File.dirname(__FILE__), "test1.gds") log = "strmclip\n" + `#{self.buddy_bin("strmclip")} #{in_file} #{out_file} 2>&1` - assert_equal(File.exists?(out_file), true) + assert_equal(File.exist?(out_file), true) assert_equal(log, "strmclip\n") end diff --git a/testdata/klayout_main/main.rb b/testdata/klayout_main/main.rb index fff79b11e..279c20417 100644 --- a/testdata/klayout_main/main.rb +++ b/testdata/klayout_main/main.rb @@ -45,7 +45,7 @@ class KLayoutMain_TestClass < TestBase def klayout_bin # special location for MacOS file = File.join(RBA::Application::instance.inst_path, "klayout.app", "Contents", "MacOS", "klayout") - if !File.exists?(file) + if !File.exist?(file) file = File.join(RBA::Application::instance.inst_path, "klayout") end return file