Reduce nesting and remove extra whitespace in python_helper

1 files changed, 61 insertions, 62 deletions

diff --git a/Library/Homebrew/python_helper.rb b/Library/Homebrew/python_helper.rb
index 3db59b334..5fc66c112 100644
--- a/Library/Homebrew/python_helper.rb
+++ b/Library/Homebrew/python_helper.rb
@@ -1,4 +1,3 @@
-
 # This is used in the Formula class when the user calls
 # `python`, `python2` or `python3`.
 
@@ -19,73 +18,73 @@ def python_helper(options={:allowed_major_versions => [2, 3]}, &block)
     # We are already inside of a `python do ... end` block, so just return
     # the current_python or false if the version.major is not allowed.
     if options[:allowed_major_versions].include?(@current_python.version.major)
-      @current_python
+      return @current_python
     else
-      false
-    end
-  else
-    # Look for PythonInstalled requirements for this formula
-    python_reqs = requirements.select{ |r| r.kind_of?(PythonInstalled) }
-    if python_reqs.empty?
-      raise "If you use python in the formula, you have to add `depends_on :python` (or :python3)!"
+      return false
     end
-    # Now select those that are satisfied and matching the version.major and
-    # check that no two python binaries are the same (which could be the case
-    # because more than one `depends_on :python => 'module_name' may be present).
-    filtered_python_reqs = []
-    while !python_reqs.empty?
-      py = python_reqs.shift
-      # this is ulgy but Ruby 1.8 has no `uniq! { }`
-      if !filtered_python_reqs.map{ |fpr| fpr.binary }.include?(py.binary) &&
-         py.satisfied? &&
-         options[:allowed_major_versions].include?(py.version.major) &&
-         self.build.with?(py.name) || !(py.optional? || py.recommended?)
-      then
-        filtered_python_reqs << py
-      end
+  end
+
+  # Look for PythonInstalled requirements for this formula
+  python_reqs = requirements.select{ |r| r.kind_of?(PythonInstalled) }
+  if python_reqs.empty?
+    raise "If you use python in the formula, you have to add `depends_on :python` (or :python3)!"
+  end
+  # Now select those that are satisfied and matching the version.major and
+  # check that no two python binaries are the same (which could be the case
+  # because more than one `depends_on :python => 'module_name' may be present).
+  filtered_python_reqs = []
+  while !python_reqs.empty?
+    py = python_reqs.shift
+    # this is ulgy but Ruby 1.8 has no `uniq! { }`
+    if !filtered_python_reqs.map{ |fpr| fpr.binary }.include?(py.binary) &&
+       py.satisfied? &&
+       options[:allowed_major_versions].include?(py.version.major) &&
+       self.build.with?(py.name) || !(py.optional? || py.recommended?)
+    then
+      filtered_python_reqs << py
     end
+  end
 
-    # Allow to use an else-branch like so: `if python do ... end; else ... end`
-    return false if filtered_python_reqs.empty?
+  # Allow to use an else-branch like so: `if python do ... end; else ... end`
+  return false if filtered_python_reqs.empty?
 
-    # Sort by version, so the older 2.x will be used first and if no
-    # block_given? then 2.x is preferred because it is returned.
-    # Further note, having 3.x last allows us to run `2to3 --write .`
-    # which modifies the sources in-place (for some packages that need this).
-    filtered_python_reqs.sort_by{ |py| py.version }.map do |py|
-      # Now is the time to set the site_packages to the correct value
-      py.site_packages = lib/py.xy/'site-packages'
-      if !block_given?
-        return py
-      else
-        puts "brew: Python block (#{py.binary})..." if ARGV.verbose? && ARGV.debug?
-        # Ensure env changes are only temporary
-        begin
-          old_env = ENV.to_hash
-          # In order to install into the Cellar, the dir must exist and be in the
-          # PYTHONPATH. This will be executed in the context of the formula
-          # so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib
-          puts "brew: Appending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose?
-          mkdir_p py.site_packages
-          ENV.append 'PYTHONPATH', py.site_packages, ':'
-          ENV['PYTHON'] = py.binary
-          ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':'
-          ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path
-          ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx?
-          #Note: Don't set LDFLAGS to point to the Python.framework, because
-          #      it breaks builds (for example scipy.)
+  # Sort by version, so the older 2.x will be used first and if no
+  # block_given? then 2.x is preferred because it is returned.
+  # Further note, having 3.x last allows us to run `2to3 --write .`
+  # which modifies the sources in-place (for some packages that need this).
+  filtered_python_reqs.sort_by{ |py| py.version }.map do |py|
+    # Now is the time to set the site_packages to the correct value
+    py.site_packages = lib/py.xy/'site-packages'
+    if !block_given?
+      return py
+    else
+      puts "brew: Python block (#{py.binary})..." if ARGV.verbose? && ARGV.debug?
+      # Ensure env changes are only temporary
+      begin
+        old_env = ENV.to_hash
+        # In order to install into the Cellar, the dir must exist and be in the
+        # PYTHONPATH. This will be executed in the context of the formula
+        # so that lib points to the HOMEBREW_PREFIX/Cellar/<formula>/<version>/lib
+        puts "brew: Appending to PYTHONPATH: #{py.site_packages}" if ARGV.verbose?
+        mkdir_p py.site_packages
+        ENV.append 'PYTHONPATH', py.site_packages, ':'
+        ENV['PYTHON'] = py.binary
+        ENV.prepend 'CMAKE_INCLUDE_PATH', py.incdir, ':'
+        ENV.prepend 'PKG_CONFIG_PATH', py.pkg_config_path, ':' if py.pkg_config_path
+        ENV.prepend 'PATH', py.binary.dirname, ':' unless py.from_osx?
+        #Note: Don't set LDFLAGS to point to the Python.framework, because
+        #      it breaks builds (for example scipy.)
 
-          # Track the state of the currently selected python for this block,
-          # so if this python_helper is called again _inside_ the block,
-          # we can just return the right python (see `else`-branch a few lines down):
-          @current_python = py
-          res = instance_eval(&block)
-          @current_python = nil
-          res
-        ensure
-          ENV.replace(old_env)
-        end
+        # Track the state of the currently selected python for this block,
+        # so if this python_helper is called again _inside_ the block,
+        # we can just return the right python (see `else`-branch a few lines down):
+        @current_python = py
+        res = instance_eval(&block)
+        @current_python = nil
+        res
+      ensure
+        ENV.replace(old_env)
       end
     end
   end
-end  # enf of python_helper method
+end