From 3db033ca89bd86956bdaadaa515a079aee69d9e0 Mon Sep 17 00:00:00 2001 From: Chongyu Zhu Date: Thu, 8 Mar 2018 13:02:03 +0800 Subject: [PATCH 1/3] keg: `delete_pyc_files!` should also remove `__pycache__` --- Library/Homebrew/keg.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index e3b93fa728..550f657348 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -519,6 +519,7 @@ class Keg def delete_pyc_files! find { |pn| pn.delete if %w[.pyc .pyo].include?(pn.extname) } + find { |pn| pn.delete if pn.basename.to_s == "__pycache__" } end private From 8e928992f5d2a1bbc39b295e2d2a9a2565ecec2a Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 8 Mar 2018 08:17:57 +0000 Subject: [PATCH 2/3] keg: tweak delete_pyc_files! --- Library/Homebrew/keg.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index 550f657348..cf42b8c797 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -518,8 +518,11 @@ class Keg end def delete_pyc_files! - find { |pn| pn.delete if %w[.pyc .pyo].include?(pn.extname) } - find { |pn| pn.delete if pn.basename.to_s == "__pycache__" } + find do |path| + if %w[.pyc .pyo].include?(pn.extname) || pn.basename.to_s == "__pycache__" + path.delete + end + end end private From 948b1b8dbeb7bce35d5b0ecc45b14ac50d4eee93 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Thu, 8 Mar 2018 08:37:34 +0000 Subject: [PATCH 3/3] keg: fix delete_pyc_files path typo. --- Library/Homebrew/keg.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/keg.rb b/Library/Homebrew/keg.rb index cf42b8c797..618c847a4c 100644 --- a/Library/Homebrew/keg.rb +++ b/Library/Homebrew/keg.rb @@ -519,7 +519,7 @@ class Keg def delete_pyc_files! find do |path| - if %w[.pyc .pyo].include?(pn.extname) || pn.basename.to_s == "__pycache__" + if %w[.pyc .pyo].include?(path.extname) || path.basename.to_s == "__pycache__" path.delete end end