From 028b795e2c705baa3652f26d8eec090e6b428d33 Mon Sep 17 00:00:00 2001 From: Nick Lewis Date: Thu, 21 Jul 2011 11:52:27 -0700 Subject: Remove dead uses of Puppet::Util::Cacher from autoloader In the past, Puppet::Util::Autoload used a cached_attr for its 'searchpath'. However, it no longer does that, so its references to Puppet::Util::Cacher are unnecessary. Reviewed-By: Jacob Helwig (cherry picked from commit ce08cba9eb92abce7f7ab77dcf7eb9f9435d4040) --- lib/puppet/util/autoload.rb | 2 -- spec/unit/util/autoload_spec.rb | 4 ---- 2 files changed, 6 deletions(-) diff --git a/lib/puppet/util/autoload.rb b/lib/puppet/util/autoload.rb index 6537a4a4e..2e8710ab1 100644 --- a/lib/puppet/util/autoload.rb +++ b/lib/puppet/util/autoload.rb @@ -1,5 +1,4 @@ require 'puppet/util/warnings' -require 'puppet/util/cacher' # Autoload paths, either based on names or all at once. class Puppet::Util::Autoload @@ -7,7 +6,6 @@ class Puppet::Util::Autoload include Puppet::Util include Puppet::Util::Warnings - include Puppet::Util::Cacher include Puppet::Util::Autoload::FileCache @autoloaders = {} diff --git a/spec/unit/util/autoload_spec.rb b/spec/unit/util/autoload_spec.rb index 100975f27..47ee54e1f 100755 --- a/spec/unit/util/autoload_spec.rb +++ b/spec/unit/util/autoload_spec.rb @@ -12,10 +12,6 @@ describe Puppet::Util::Autoload do @autoload.stubs(:eachdir).yields "/my/dir" end - it "should use the Cacher module" do - Puppet::Util::Autoload.ancestors.should be_include(Puppet::Util::Cacher) - end - describe "when building the search path" do before :each do @dira = make_absolute('/a') -- cgit