summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/json/common.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb
index 44e659f..13debd1 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -341,11 +341,13 @@ module JSON
end
# Shortuct for iconv.
- def self.iconv(to, from, string)
- if String.method_defined?(:encode)
+ if String.method_defined?(:encode)
+ def self.iconv(to, from, string)
string.encode(to, from)
- else
- require 'iconv'
+ end
+ else
+ require 'iconv'
+ def self.iconv(to, from, string)
Iconv.iconv(to, from, string).first
end
end