aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/dependency_collector.rb
diff options
context:
space:
mode:
authorMike McQuaid2014-01-04 13:18:42 +0000
committerMike McQuaid2014-01-20 15:42:52 -0800
commit28143fb653bbb00810b6a6828a7e78f82b12b657 (patch)
treea39a2b2c22965f52bb319179086713a42ffc2fdb /Library/Homebrew/dependency_collector.rb
parentcb024e222ced7c47f895c670686954fbc111a748 (diff)
downloadbrew-28143fb653bbb00810b6a6828a7e78f82b12b657.tar.bz2
PythonDependency: massive refactoring.
Closes Homebrew/homebrew#24842.
Diffstat (limited to 'Library/Homebrew/dependency_collector.rb')
-rw-r--r--Library/Homebrew/dependency_collector.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb
index b3b1f52e1..0e3feac8e 100644
--- a/Library/Homebrew/dependency_collector.rb
+++ b/Library/Homebrew/dependency_collector.rb
@@ -74,9 +74,6 @@ class DependencyCollector
if tags.empty?
Dependency.new(spec, tags)
elsif (tag = tags.first) && LANGUAGE_MODULES.include?(tag)
- # Next line only for legacy support of `depends_on 'module' => :python`
- # It should be replaced by `depends_on :python => 'module'`
- return PythonDependency.new("2", Array(spec)) if tag == :python
LanguageModuleDependency.new(tag, spec)
else
Dependency.new(spec, tags)
@@ -105,8 +102,9 @@ class DependencyCollector
when :clt then CLTDependency.new(tags)
when :arch then ArchRequirement.new(tags)
when :hg then MercurialDependency.new(tags)
- when :python, :python2 then PythonDependency.new("2", tags)
- when :python3 then PythonDependency.new("3", tags)
+ # python2 is deprecated
+ when :python, :python2 then PythonDependency.new(tags)
+ when :python3 then Python3Dependency.new(tags)
# Tiger's ld is too old to properly link some software
when :ld64 then LD64Dependency.new if MacOS.version < :leopard
when :ant then ant_dep(spec, tags)