Merge branch 'template-not-defined-test-failure'

* template-not-defined-test-failure:
  Clean up indentation, whitespace, and commented out code
  Remove order dependency from functions integration spec

2 files changed, 2 insertions, 7 deletions

diff --git a/lib/puppet/parser/functions.rb b/lib/puppet/parser/functions.rb
index 5807c0bbe..e19ac127f 100644
--- a/lib/puppet/parser/functions.rb
+++ b/lib/puppet/parser/functions.rb
@@ -16,11 +16,9 @@ module Puppet::Parser::Functions
 
   def self.autoloader
     unless defined?(@autoloader)
-
-            @autoloader = Puppet::Util::Autoload.new(
+      @autoloader = Puppet::Util::Autoload.new(
         self,
         "puppet/parser/functions",
-
         :wrap => false
       )
     end
@@ -88,7 +86,6 @@ module Puppet::Parser::Functions
     ret = ""
 
     functions.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, hash|
-      #ret += "#{name}\n#{hash[:type]}\n"
       ret += "#{name}\n#{"-" * name.to_s.length}\n"
       if hash[:doc]
         ret += Puppet::Util::Docs.scrub(hash[:doc])
@@ -114,11 +111,9 @@ module Puppet::Parser::Functions
   end
 
   # Runs a newfunction to create a function for each of the log levels
-
   Puppet::Util::Log.levels.each do |level|
     newfunction(level, :doc => "Log a message on the server at level #{level.to_s}.") do |vals|
       send(level, vals.join(" "))
     end
   end
-
 end
diff --git a/spec/integration/parser/functions_spec.rb b/spec/integration/parser/functions_spec.rb
index 6791987d7..6a8fbca9c 100755
--- a/spec/integration/parser/functions_spec.rb
+++ b/spec/integration/parser/functions_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Puppet::Parser::Functions do
   before :each do
-    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.function("template")
+    Puppet::Parser::Functions.rmfunction("template") if Puppet::Parser::Functions.functions.include?("template")
   end
 
   it "should support multiple threads autoloading the same function" do