Merge branch 'master' into mkdir_with_intermediates

4 files changed, 9 insertions, 4 deletions

diff --git a/Library/Homebrew/compat/dependency_collector.rb b/Library/Homebrew/compat/dependency_collector.rb
index 27236ae4b..b18adc490 100644
--- a/Library/Homebrew/compat/dependency_collector.rb
+++ b/Library/Homebrew/compat/dependency_collector.rb
@@ -1,7 +1,7 @@
 require "dependency_collector"
 
 class DependencyCollector
-  alias_method :_parse_symbol_spec, :parse_symbol_spec
+  alias _parse_symbol_spec parse_symbol_spec
 
   def parse_symbol_spec(spec, tags)
     case spec
diff --git a/Library/Homebrew/compat/formula.rb b/Library/Homebrew/compat/formula.rb
index 41896d261..853a38706 100644
--- a/Library/Homebrew/compat/formula.rb
+++ b/Library/Homebrew/compat/formula.rb
@@ -72,8 +72,8 @@ class Formula
     yield if block_given?
     PythonRequirement.new
   end
-  alias_method :python2, :python
-  alias_method :python3, :python
+  alias python2 python
+  alias python3 python
 
   def startup_plist
     odeprecated "Formula#startup_plist", "Formula#plist"
diff --git a/Library/Homebrew/compat/formula_specialties.rb b/Library/Homebrew/compat/formula_specialties.rb
index f709bcb5b..ec5e91ce8 100644
--- a/Library/Homebrew/compat/formula_specialties.rb
+++ b/Library/Homebrew/compat/formula_specialties.rb
@@ -25,7 +25,7 @@ class AmazonWebServicesFormula < Formula
     libexec.install Dir["*"]
     bin.install_symlink Dir["#{libexec}/bin/*"] - ["#{libexec}/bin/service"]
   end
-  alias_method :standard_install, :install
+  alias standard_install install
 
   # Use this method to generate standard caveats.
   def standard_instructions(home_name, home_value = libexec)
diff --git a/Library/Homebrew/compat/macos.rb b/Library/Homebrew/compat/macos.rb
index 957a0b725..6b0166e40 100644
--- a/Library/Homebrew/compat/macos.rb
+++ b/Library/Homebrew/compat/macos.rb
@@ -136,6 +136,11 @@ module OS
         odeprecated "MacOS.has_apple_developer_tools?", "DevelopmentTools.installed?"
         DevelopmentTools.installed?
       end
+
+      def release
+        odeprecated "MacOS.release", "MacOS.version"
+        version
+      end
     end
   end
 end