From facc83091b06052fbc7da4b9d01ba94fbb71dbe9 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Tue, 15 Oct 2013 13:26:23 -0500 Subject: Avoid the need to defensively flatten tags array --- Library/Homebrew/dependency_collector.rb | 2 +- Library/Homebrew/requirements/python_dependency.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'Library') diff --git a/Library/Homebrew/dependency_collector.rb b/Library/Homebrew/dependency_collector.rb index 608852e95..f8bd2d41a 100644 --- a/Library/Homebrew/dependency_collector.rb +++ b/Library/Homebrew/dependency_collector.rb @@ -76,7 +76,7 @@ class DependencyCollector 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", spec) if tag == :python + return PythonDependency.new("2", Array(spec)) if tag == :python LanguageModuleDependency.new(tag, spec) else Dependency.new(spec, tags) diff --git a/Library/Homebrew/requirements/python_dependency.rb b/Library/Homebrew/requirements/python_dependency.rb index f07d3b212..12e0342b2 100644 --- a/Library/Homebrew/requirements/python_dependency.rb +++ b/Library/Homebrew/requirements/python_dependency.rb @@ -34,7 +34,6 @@ class PythonDependency < Requirement end def initialize(default_version="2.6", tags=[]) - tags = [tags].flatten # Extract the min_version if given. Default to default_version else if /(\d+\.)*\d+/ === tags.first.to_s @min_version = PythonVersion.new(tags.shift) -- cgit v1.2.3