KCODE is gone

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
index b55204ac8fdd17712ae920f509c864288301d088..ca0d2957c7ec51e0f52ffbce4ca8473cc499184b 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb
@@ -8,8 +8,6 @@ module Puppet::Parser::Functions
     parser = Puppet::Parser::Parser.new(environment)
     parser.watch_file(yamlfile)
 
-    $KCODE = 'utf-8'
-
     ans = {"name" => "unknown"}
     yaml = YAML.load_file(yamlfile)
 

diff --git a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
index b38f5d56a3793e4f4365686f8d747ff97bfac587..f53014dee3a22c2f7dcaeda9fd746fa9be329605 100644 (file)
--- a/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb
@@ -42,7 +42,6 @@ module Puppet::Parser::Functions
     }
 
     require 'yaml'
-    $KCODE = 'utf-8'
 
     yaml = YAML.load_file(yamlfile)
     ret = {}