Merge branch 'bug/2.7.x/7353-kill-for-humans-format-entirely' into 2.7.x

1 files changed, 5 insertions, 15 deletions

diff --git a/lib/puppet/application/face_base.rb b/lib/puppet/application/face_base.rb
index 8c1e03e3f..7a5ce3400 100644
--- a/lib/puppet/application/face_base.rb
+++ b/lib/puppet/application/face_base.rb
@@ -29,17 +29,11 @@ class Puppet::Application::FaceBase < Puppet::Application
   attr_accessor :face, :action, :type, :arguments, :render_as
 
   def render_as=(format)
-    @render_as = case format.to_sym
-                 when :for_humans then
-                   # We have an old alias name for :console, which went out in
-                   # 2.7.0rc1, so we are going to carry it forward for a
-                   # while. --daniel 2011-05-04
-                   Puppet::Network::FormatHandler.format(:console)
-                 when :json then
-                   Puppet::Network::FormatHandler.format(:pson)
-                 else
-                   Puppet::Network::FormatHandler.format(format)
-                 end
+    if format == :json then
+      @render_as = Puppet::Network::FormatHandler.format(:pson)
+    else
+      @render_as = Puppet::Network::FormatHandler.format(format)
+    end
     @render_as or raise ArgumentError, "I don't know how to render '#{format}'"
   end
 
@@ -47,10 +41,6 @@ class Puppet::Application::FaceBase < Puppet::Application
     # Invoke the rendering hook supplied by the user, if appropriate.
     if hook = action.when_rendering(render_as.name)
       result = hook.call(result)
-    elsif render_as.name == :console and hook = action.when_rendering(:for_humans)
-      # We have an old alias name for :console, which went out in 2.7.0rc1, so
-      # we are going to carry it forward for a while. --daniel 2011-05-04
-      result = hook.call(result)
     end
 
     render_as.render(result)