summaryrefslogtreecommitdiff
path: root/lib/json/common.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/json/common.rb')
-rw-r--r--lib/json/common.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/json/common.rb b/lib/json/common.rb
index d5444b9..44e659f 100644
--- a/lib/json/common.rb
+++ b/lib/json/common.rb
@@ -1,5 +1,4 @@
require 'json/version'
-require 'iconv'
module JSON
class << self
@@ -343,7 +342,12 @@ module JSON
# Shortuct for iconv.
def self.iconv(to, from, string)
- Iconv.iconv(to, from, string).first
+ if String.method_defined?(:encode)
+ string.encode(to, from)
+ else
+ require 'iconv'
+ Iconv.iconv(to, from, string).first
+ end
end
end