puppet 4.1.0 → 5.0.0

data/lib/puppet/util/filetype.rb

@@ -45,7 +45,7 @@ class Puppet::Util::FileType
         rescue Puppet::Error => detail
           raise
         rescue => detail
-          message = "#{self.class} could not read #{@path}: #{detail}"
+          message = _("%{klass} could not read %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
           Puppet.log_exception(detail, message)
           raise Puppet::Error, message, detail.backtrace
         end
@@ -61,7 +61,7 @@ class Puppet::Util::FileType
         rescue Puppet::Error => detail
           raise
         rescue => detail
-          message = "#{self.class} could not write #{@path}: #{detail}"
+          message = _("%{klass} could not write %{path}: %{detail}") % { klass: self.class, path: @path, detail: detail }
           Puppet.log_exception(detail, message)
           raise Puppet::Error, message, detail.backtrace
         end
@@ -79,7 +79,7 @@ class Puppet::Util::FileType
   end
 
   def initialize(path, default_mode = nil)
-    raise ArgumentError.new("Path is nil") if path.nil?
+    raise ArgumentError.new(_("Path is nil")) if path.nil?
     @path = path
     @default_mode = default_mode
   end
@@ -105,7 +105,9 @@ class Puppet::Util::FileType
     # Read the file.
     def read
       if Puppet::FileSystem.exist?(@path)
-        File.read(@path)
+        # this code path is used by many callers so the original default is
+        # being explicitly preserved
+        Puppet::FileSystem.read(@path, :encoding => Encoding.default_external)
       else
         return nil
       end
@@ -118,7 +120,8 @@ class Puppet::Util::FileType
 
     # Overwrite the file.
     def write(text)
-      tf = Tempfile.new("puppet")
+      # this file is managed by the OS and should be using system encoding
+      tf = Tempfile.new("puppet", :encoding => Encoding.default_external)
       tf.print text; tf.flush
       File.chmod(@default_mode, tf.path) if @default_mode
       FileUtils.cp(tf.path, @path)
@@ -145,19 +148,19 @@ class Puppet::Util::FileType
 
     # Read the file.
     def read
-      Puppet.info "Reading #{@path} from RAM"
+      Puppet.info _("Reading %{path} from RAM") % { path: @path }
       @@tabs[@path]
     end
 
     # Remove the file.
     def remove
-      Puppet.info "Removing #{@path} from RAM"
+      Puppet.info _("Removing %{path} from RAM") % { path: @path }
       @@tabs[@path] = ""
     end
 
     # Overwrite the file.
     def write(text)
-      Puppet.info "Writing #{@path} to RAM"
+      Puppet.info _("Writing %{path} to RAM") % { path: @path }
       @@tabs[@path] = text
     end
   end
@@ -172,7 +175,7 @@ class Puppet::Util::FileType
       begin
         @uid = Puppet::Util.uid(user)
       rescue Puppet::Error => detail
-        raise FileReadError, "Could not retrieve user #{user}: #{detail}", detail.backtrace
+        raise FileReadError, _("Could not retrieve user %{user}: %{detail}") % { user: user, detail: detail }, detail.backtrace
       end
 
       # XXX We have to have the user name, not the uid, because some
@@ -197,7 +200,8 @@ class Puppet::Util::FileType
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      IO.popen("#{cmdbase()} -", "w") { |p|
+      # this file is managed by the OS and should be using system encoding
+      IO.popen("#{cmdbase()} -", "w", :encoding => Encoding.default_external) { |p|
         p.print text
       }
     end
@@ -226,9 +230,9 @@ class Puppet::Util::FileType
       when /can't open your crontab/
         return ""
       when /you are not authorized to use cron/
-        raise FileReadError, "User #{@path} not authorized to use cron", detail.backtrace
+        raise FileReadError, _("User %{path} not authorized to use cron") % { path: @path }, detail.backtrace
       else
-        raise FileReadError, "Could not read crontab for #{@path}: #{detail}", detail.backtrace
+        raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
     end
 
@@ -236,13 +240,14 @@ class Puppet::Util::FileType
     def remove
       Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
     rescue => detail
-      raise FileReadError, "Could not remove crontab for #{@path}: #{detail}", detail.backtrace
+      raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end
 
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      output_file = Tempfile.new("puppet_suntab")
+      # this file is managed by the OS and should be using system encoding
+      output_file = Tempfile.new("puppet_suntab", :encoding => Encoding.default_external)
       begin
         output_file.print text
         output_file.close
@@ -250,7 +255,7 @@ class Puppet::Util::FileType
         File.chown(Puppet::Util.uid(@path), nil, output_file.path)
         Puppet::Util::Execution.execute(["crontab", output_file.path], cronargs)
       rescue => detail
-        raise FileReadError, "Could not write crontab for #{@path}: #{detail}", detail.backtrace
+        raise FileReadError, _("Could not write crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       ensure
         output_file.close
         output_file.unlink
@@ -268,9 +273,9 @@ class Puppet::Util::FileType
       when /Cannot open a file in the .* directory/
         return ""
       when /You are not authorized to use the cron command/
-        raise FileReadError, "User #{@path} not authorized to use cron", detail.backtrace
+        raise FileReadError, _("User %{path} not authorized to use cron") % { path: @path }, detail.backtrace
       else
-        raise FileReadError, "Could not read crontab for #{@path}: #{detail}", detail.backtrace
+        raise FileReadError, _("Could not read crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       end
     end
 
@@ -278,13 +283,14 @@ class Puppet::Util::FileType
     def remove
       Puppet::Util::Execution.execute(%w{crontab -r}, cronargs)
     rescue => detail
-      raise FileReadError, "Could not remove crontab for #{@path}: #{detail}", detail.backtrace
+      raise FileReadError, _("Could not remove crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
     end
 
     # Overwrite a specific @path's cron tab; must be passed the @path name
     # and the text with which to create the cron tab.
     def write(text)
-      output_file = Tempfile.new("puppet_aixtab")
+      # this file is managed by the OS and should be using system encoding
+      output_file = Tempfile.new("puppet_aixtab", :encoding => Encoding.default_external)
 
       begin
         output_file.print text
@@ -293,7 +299,7 @@ class Puppet::Util::FileType
         File.chown(Puppet::Util.uid(@path), nil, output_file.path)
         Puppet::Util::Execution.execute(["crontab", output_file.path], cronargs)
       rescue => detail
-        raise FileReadError, "Could not write crontab for #{@path}: #{detail}", detail.backtrace
+        raise FileReadError, _("Could not write crontab for %{path}: %{detail}") % { path: @path, detail: detail }, detail.backtrace
       ensure
         output_file.close
         output_file.unlink

data/lib/puppet/util/http_proxy.rb

@@ -1,4 +1,16 @@
+require 'uri'
+require 'openssl'
+
 module Puppet::Util::HttpProxy
+  def self.proxy(uri)
+    if self.no_proxy?(uri)
+      proxy_class = Net::HTTP::Proxy(nil)
+    else
+      proxy_class = Net::HTTP::Proxy(self.http_proxy_host, self.http_proxy_port, self.http_proxy_user, self.http_proxy_password)
+    end
+
+    return proxy_class.new(uri.host, uri.port)
+  end
 
   def self.http_proxy_env
     # Returns a URI object if proxy is set, or nil
@@ -11,6 +23,57 @@ module Puppet::Util::HttpProxy
     return nil
   end
 
+  # The documentation around the format of the no_proxy variable seems
+  # inconsistent.  Some suggests the use of the * as a way of matching any
+  # hosts under a domain, e.g.:
+  #   *.example.com
+  # Other documentation suggests that just a leading '.' indicates a domain
+  # level exclusion, e.g.:
+  #   .example.com
+  # We'll accommodate both here.
+  def self.no_proxy?(dest)
+    unless no_proxy_env = ENV["no_proxy"] || ENV["NO_PROXY"]
+      return false
+    end
+
+    unless dest.is_a? URI
+      begin
+        dest = URI.parse(dest)
+      rescue URI::InvalidURIError
+        return false
+      end
+    end
+
+    no_proxy_env.split(/\s*,\s*/).each do |d|
+      host, port = d.split(':')
+      host = Regexp.escape(host).gsub('\*', '.*')
+
+      #If the host of this no_proxy value starts with '.', this entry is
+      #a domain level entry. Don't pin the regex to the beginning of the entry.
+      #If it does not start with a '.' then it is a host specific entry and
+      #should be matched to the destination starting at the beginning.
+      unless host =~ /^\\\./
+        host = "^#{host}"
+      end
+
+      #If this no_proxy entry specifies a port, we want to match it against
+      #the destination port.  Otherwise just match hosts.
+      if port
+        no_proxy_regex  = %r(#{host}:#{port}$)
+        dest_string     = "#{dest.host}:#{dest.port}"
+      else
+        no_proxy_regex  = %r(#{host}$)
+        dest_string     = "#{dest.host}"
+      end
+
+      if no_proxy_regex.match(dest_string)
+        return true
+      end
+    end
+
+    return false
+  end
+
   def self.http_proxy_host
     env = self.http_proxy_env
 
@@ -62,4 +125,73 @@ module Puppet::Util::HttpProxy
 
     return Puppet.settings[:http_proxy_password]
   end
+
+  # Return a Net::HTTP::Proxy object.
+  #
+  # This method optionally configures SSL correctly if the URI scheme is
+  # 'https', including setting up the root certificate store so remote server
+  # SSL certificates can be validated.
+  #
+  # @param [URI] uri The URI that is to be accessed.
+  # @return [Net::HTTP::Proxy] object constructed tailored for the passed URI
+  def self.get_http_object(uri)
+    proxy = proxy(uri)
+
+    if uri.scheme == 'https'
+      cert_store = OpenSSL::X509::Store.new
+      cert_store.set_default_paths
+
+      proxy.use_ssl = true
+      proxy.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      proxy.cert_store = cert_store
+    end
+
+    if Puppet[:http_debug]
+      proxy.set_debug_output($stderr)
+    end
+
+    proxy.open_timeout = Puppet[:http_connect_timeout]
+    proxy.read_timeout = Puppet[:http_read_timeout]
+
+    proxy
+  end
+
+  # Retrieve a document through HTTP(s), following redirects if necessary.
+  # 
+  # Based on the the client implementation in the HTTP pool.
+  #
+  # @see Puppet::Network::HTTP::Connection#request_with_redirects
+  #
+  # @param [URI] uri The address of the resource to retrieve.
+  # @param [symbol] method The name of the Net::HTTP method to use, typically :get, :head, :post etc.
+  # @param [FixNum] redirect_limit The number of redirections that can be followed.
+  # @return [Net::HTTPResponse] a response object
+  def self.request_with_redirects(uri, method, redirect_limit = 10, &block)
+    current_uri = uri
+    response = nil
+
+    0.upto(redirect_limit) do |redirection|
+      proxy = get_http_object(current_uri)
+      response = proxy.send(:head, current_uri.path)
+
+      if [301, 302, 307].include?(response.code.to_i)
+        # handle the redirection
+        current_uri = URI.parse(response['location'])
+        next
+      end
+
+      if block_given?
+        headers = {'Accept' => 'binary', 'accept-encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'}
+        response = proxy.send("request_#{method}".to_sym, current_uri.path, headers, &block)
+      else
+        response = proxy.send(method, current_uri.path)
+      end
+
+      Puppet.debug("HTTP #{method.to_s.upcase} request to #{current_uri} returned #{response.code} #{response.message}")
+
+      return response
+    end
+
+    raise RedirectionLimitExceededException, _("Too many HTTP redirections for %{uri}") % { uri: uri }
+  end
 end

data/lib/puppet/util/inifile.rb

@@ -56,7 +56,7 @@ module Puppet::Util::IniConfig
     end
 
     # Set the entry 'key=value'. If no entry with the
-    # given key exists, one is appended to teh end of the section
+    # given key exists, one is appended to the end of the section
     def []=(key, value)
       entry = find_entry(key)
       @dirty = true
@@ -136,7 +136,7 @@ module Puppet::Util::IniConfig
     def read
       text = @filetype.read
       if text.nil?
-        raise IniParseError, "Cannot read nonexistent file #{@file.inspect}"
+        raise IniParseError, _("Cannot read nonexistent file %{file}") % { file: @file.inspect }
       end
       parse(text)
     end
@@ -183,13 +183,13 @@ module Puppet::Util::IniConfig
           val = match[2]
 
           if section.nil?
-            raise IniParseError.new("Property with key #{key.inspect} outside of a section")
+            raise IniParseError.new(_("Property with key %{key} outside of a section") % { key: key.inspect })
           end
 
           section[key] = val
           optname = key
         else
-          raise IniParseError.new("Can't parse line '#{l.chomp}'", @file, line_num)
+          raise IniParseError.new(_("Can't parse line '%{line}'") % { line: l.chomp }, @file, line_num)
         end
       end
       section.mark_clean unless section.nil?
@@ -238,7 +238,7 @@ module Puppet::Util::IniConfig
     # @return [Puppet::Util::IniConfig::Section]
     def add_section(name)
       if section_exists?(name)
-        raise IniParseError.new("Section #{name.inspect} is already defined, cannot redefine", @file)
+        raise IniParseError.new(_("Section %{name} is already defined, cannot redefine") % { name: name.inspect }, @file)
       end
 
       section = Section.new(name, @file)

data/lib/puppet/util/instance_loader.rb

@@ -60,7 +60,7 @@ module Puppet::Util::InstanceLoader
     @autoloaders[type.intern]
   end
 
-  # Retrieve an alread-loaded instance, or attempt to load our instance.
+  # Retrieve an already-loaded instance, or attempt to load our instance.
   def loaded_instance(type, name)
     name = name.intern
     return nil unless instances = instance_hash(type)
@@ -68,7 +68,7 @@ module Puppet::Util::InstanceLoader
       if instance_loader(type).load(name)
         unless instances.include? name
           Puppet.warning(
-            "Loaded #{type} file for #{name} but #{type} was not defined"
+            _("Loaded %{type} file for %{name} but %{type} was not defined") % { type: type, name: name }
           )
           return nil
         end

data/lib/puppet/util/json_lockfile.rb

@@ -23,7 +23,7 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
   def lock(lock_data = nil)
     return false if locked?
 
-    super(lock_data.to_pson)
+    super(lock_data.to_json)
   end
 
   # Retrieve the (optional) lock data that was specified at the time the file
@@ -35,9 +35,9 @@ class Puppet::Util::JsonLockfile < Puppet::Util::Lockfile
     return nil unless file_locked?
     file_contents = super
     return nil if file_contents.nil? or file_contents.empty?
-    PSON.parse(file_contents)
-  rescue PSON::ParserError => e
-    Puppet.warning "Unable to read lockfile data from #{@file_path}: not in PSON"
+    JSON.parse(file_contents)
+  rescue JSON::ParserError => e
+    Puppet.warning _("Unable to read lockfile data from %{path}: not in JSON") % { path: @file_path }
     nil
   end
 

data/lib/puppet/util/ldap/connection.rb

@@ -35,7 +35,7 @@ class Puppet::Util::Ldap::Connection
   end
 
   def initialize(host, port, options = {})
-    raise Puppet::Error, "Could not set up LDAP Connection: Missing ruby/ldap libraries" unless Puppet.features.ldap?
+    raise Puppet::Error, _("Could not set up LDAP Connection: Missing ruby/ldap libraries") unless Puppet.features.ldap?
 
     @host, @port = host, port
 
@@ -66,6 +66,6 @@ class Puppet::Util::Ldap::Connection
       @connection.set_option(LDAP::LDAP_OPT_REFERRALS, LDAP::LDAP_OPT_ON)
       @connection.simple_bind(user, password)
   rescue => detail
-      raise Puppet::Error, "Could not connect to LDAP: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not connect to LDAP: %{detail}") % { detail: detail }, detail.backtrace
   end
 end

data/lib/puppet/util/ldap/manager.rb

@@ -213,14 +213,14 @@ class Puppet::Util::Ldap::Manager
   # Update the ldap entry with the desired state.
   def update(name, is, should)
     if should[:ensure] == :absent
-      Puppet.info "Removing #{dn(name)} from ldap"
+      Puppet.info _("Removing %{name} from ldap") % { name: dn(name) }
       delete(name)
       return
     end
 
     # We're creating a new entry
     if is.empty? or is[:ensure] == :absent
-      Puppet.info "Creating #{dn(name)} in ldap"
+      Puppet.info _("Creating %{name} in ldap") % { name: dn(name) }
       # Remove any :absent params and :ensure, then convert the names to ldap names.
       attrs = ldap_convert(should)
       create(name, attrs)

data/lib/puppet/util/limits.rb

@@ -7,6 +7,6 @@ module Puppet::Util::Limits
 
     Process.setpriority(0, Process.pid, priority)
   rescue Errno::EACCES, NotImplementedError
-    Puppet.warning("Failed to set process priority to '#{priority}'")
+    Puppet.warning(_("Failed to set process priority to '%{priority}'") % { priority: priority })
   end
 end

data/lib/puppet/util/log/destinations.rb

@@ -18,7 +18,7 @@ Puppet::Util::Log.newdesttype :syslog do
     begin
       facility = Syslog.const_get("LOG_#{str.upcase}")
     rescue NameError
-      raise Puppet::Error, "Invalid syslog facility #{str}", $!.backtrace
+      raise Puppet::Error, _("Invalid syslog facility %{str}") % { str: str }, $!.backtrace
     end
 
     @syslog = Syslog.open(name, options, facility)
@@ -72,7 +72,7 @@ Puppet::Util::Log.newdesttype :file do
     # specified a "special" destination.
     unless Puppet::FileSystem.exist?(Puppet::FileSystem.dir(path))
       FileUtils.mkdir_p(File.dirname(path), :mode => 0755)
-      Puppet.info "Creating log directory #{File.dirname(path)}"
+      Puppet.info _("Creating log directory %{dir}") % { dir: File.dirname(path) }
     end
 
     # create the log file, if it doesn't already exist
@@ -97,7 +97,7 @@ Puppet::Util::Log.newdesttype :file do
       begin
         FileUtils.chown(Puppet[:user], Puppet[:group], path)
       rescue ArgumentError, Errno::EPERM
-        Puppet.err "Unable to set ownership to #{Puppet[:user]}:#{Puppet[:group]} for log file: #{path}"
+        Puppet.err _("Unable to set ownership to %{user}:%{group} for log file: %{path}") % { user: Puppet[:user], group: Puppet[:group], path: path }
       end
     end
 
@@ -136,7 +136,7 @@ Puppet::Util::Log.newdesttype :logstash_event do
 
   def handle(msg)
     message = format(msg)
-    $stdout.puts message.to_pson
+    $stdout.puts message.to_json
   end
 end
 
@@ -212,37 +212,31 @@ Puppet::Util::Log.newdesttype :array do
 end
 
 Puppet::Util::Log.newdesttype :eventlog do
+  # Leaving these in for backwards compatibility - duplicates the same in
+  # Puppet::Util::Windows::EventLog
   Puppet::Util::Log::DestEventlog::EVENTLOG_ERROR_TYPE       = 0x0001
   Puppet::Util::Log::DestEventlog::EVENTLOG_WARNING_TYPE     = 0x0002
   Puppet::Util::Log::DestEventlog::EVENTLOG_INFORMATION_TYPE = 0x0004
 
   def self.suitable?(obj)
-    Puppet.features.eventlog?
+    Puppet.features.microsoft_windows?
   end
 
   def initialize
-    @eventlog = Win32::EventLog.open("Application")
+    @eventlog = Puppet::Util::Windows::EventLog.open("Puppet")
   end
 
   def to_native(level)
-    case level
-    when :debug,:info,:notice
-      [self.class::EVENTLOG_INFORMATION_TYPE, 0x01]
-    when :warning
-      [self.class::EVENTLOG_WARNING_TYPE, 0x02]
-    when :err,:alert,:emerg,:crit
-      [self.class::EVENTLOG_ERROR_TYPE, 0x03]
-    end
+    Puppet::Util::Windows::EventLog.to_native(level)
   end
 
   def handle(msg)
     native_type, native_id = to_native(msg.level)
 
     @eventlog.report_event(
-      :source      => "Puppet",
       :event_type  => native_type,
       :event_id    => native_id,
-      :data        => (msg.source and msg.source != 'Puppet' ? "#{msg.source}: " : '') + msg.to_s
+      :data        => (msg.source && msg.source != 'Puppet' ? "#{msg.source}: " : '') + msg.to_s
     )
   end
 

data/lib/puppet/util/log.rb

@@ -1,5 +1,6 @@
 require 'puppet/util/tagging'
 require 'puppet/util/classgen'
+require 'puppet/util/psych_support'
 require 'puppet/network/format_support'
 require 'facter'
 
@@ -9,6 +10,7 @@ require 'facter'
 class Puppet::Util::Log
   include Puppet::Util
   extend Puppet::Util::ClassGen
+  include Puppet::Util::PsychSupport
   include Puppet::Util::Tagging
   include Puppet::Network::FormatSupport
 
@@ -168,6 +170,17 @@ class Puppet::Util::Log
   def Log.newmessage(msg)
     return if @levels.index(msg.level) < @loglevel
 
+    if msg.message.valid_encoding?
+      message = Puppet::Util::CharacterEncoding.convert_to_utf_8(msg.message)
+    else
+      message = _("Received a log message with invalid encoding:")
+      message << Puppet::Util::CharacterEncoding.convert_to_utf_8(msg.message.dump) << "\n"
+      # We only select the last 10 callers in the stack to avoid being spammy
+      message << _("Backtrace:") << "\n" << caller[0..10].join("\n")
+    end
+
+    msg.message = message
+
     queuemessage(msg) if @destinations.length == 0
 
     @destinations.each do |name, dest|
@@ -207,7 +220,7 @@ class Puppet::Util::Log
 
   # Reopen all of our logs.
   def Log.reopen
-    Puppet.notice "Reopening log files"
+    Puppet.notice _("Reopening log files")
     types = @destinations.keys
     @destinations.each { |type, dest|
       dest.close if dest.respond_to?(:close)
@@ -243,6 +256,31 @@ class Puppet::Util::Log
     obj
   end
 
+  # Log output using scope and level
+  #
+  # @param [Puppet::Parser::Scope] scope
+  # @param [Symbol] level log level
+  # @param [Array<Object>] vals the values to log (will be converted to string and joined with space)
+  #
+  def self.log_func(scope, level, vals)
+    # NOTE: 3x, does this: vals.join(" ")
+    # New implementation uses the evaluator to get proper formatting per type
+    vals = vals.map { |v| Puppet::Pops::Evaluator::EvaluatorImpl.new.string(v, scope) }
+
+    # Bypass Puppet.<level> call since it picks up source from "self" which is not applicable in the 4x
+    # Function API.
+    # TODO: When a function can obtain the file, line, pos of the call merge those in (3x supports
+    #       options :file, :line. (These were never output when calling the 3x logging functions since
+    #       3x scope does not know about the calling location at that detailed level, nor do they
+    #       appear in a report to stdout/error when included). Now, the output simply uses scope (like 3x)
+    #       as this is good enough, but does not reflect the true call-stack, but is a rough estimate
+    #       of where the logging call originates from).
+    #
+    Puppet::Util::Log.create({:level => level, :source => scope, :message => vals.join(" ")})
+    nil
+  end
+
+
   attr_accessor :time, :remote, :file, :line, :pos, :source, :issue_code, :environment, :node, :backtrace
   attr_reader :level, :message
 
@@ -288,7 +326,7 @@ class Puppet::Util::Log
 
   def to_data_hash
     {
-      'level' => @level,
+      'level' => @level.to_s,
       'message' => to_s,
       'source' => @source,
       'tags' => @tags.to_a,
@@ -313,10 +351,6 @@ class Puppet::Util::Log
     hash
   end
 
-  def to_pson(*args)
-    to_data_hash.to_pson(*args)
-  end
-
   def message=(msg)
     raise ArgumentError, "Puppet::Util::Log requires a message" unless msg
     @message = msg.to_s
@@ -335,7 +369,7 @@ class Puppet::Util::Log
   # If they pass a source in to us, we make sure it is a string, and
   # we retrieve any tags we can.
   def source=(source)
-    if source.respond_to?(:path)
+    if defined?(Puppet::Type) && source.is_a?(Puppet::Type)
       @source = source.path
       source.tags.each { |t| tag(t) }
       self.file = source.file
@@ -355,19 +389,19 @@ class Puppet::Util::Log
     # Issue based messages do not have details in the message. It
     # must be appended here
     unless issue_code.nil?
-      msg = "Could not parse for environment #{environment}: #{msg}" unless environment.nil?
+      msg = _("Could not parse for environment %{env}: %{msg}") % { env: environment, msg: msg } unless environment.nil?
       if file && line && pos
-        msg = "#{msg} at #{file}:#{line}:#{pos}"
+        msg = _("%{msg} at %{file}:%{line}:%{pos}") % { msg: msg, file: file, line: line, pos: pos }
       elsif file and line
-        msg = "#{msg}  at #{file}:#{line}"
+        msg = _("%{msg}  at %{file}:%{line}") % { msg: msg, file: file, line: line }
       elsif line && pos
-        msg = "#{msg}  at line #{line}:#{pos}"
+        msg = _("%{msg}  at line %{line}:%{pos}") % { msg: msg, line: line, pos: pos }
       elsif line
-        msg = "#{msg}  at line #{line}"
+        msg = _("%{msg}  at line %{line}") % { msg: msg, line: line }
       elsif file
-        msg = "#{msg}  in #{file}"
+        msg = _("%{msg}  in %{file}") % { msg: msg, file: file }
       end
-      msg = "#{msg} on node #{node}" unless node.nil?
+      msg = _("%{msg} on node %{node}") % { msg: msg, node: node } unless node.nil?
       if @backtrace.is_a?(Array)
         msg += "\n"
         msg += @backtrace.join("\n")
@@ -378,7 +412,7 @@ class Puppet::Util::Log
 
 end
 
-# This is for backward compatibility from when we changed the constant to Puppet::Util::Log
-# because the reports include the constant name.  Apparently the alias was created in
-# March 2007, should could probably be removed soon.
+# This is for backward compatibility from when we changed the constant to
+# Puppet::Util::Log because the reports include the constant name. It was
+# considered for removal but left in due to risk of breakage (PUP-7502).
 Puppet::Log = Puppet::Util::Log