From 80f6042991a1940d0580221385f8834587fe7222 Mon Sep 17 00:00:00 2001 From: Carl Allen Date: Fri, 14 Dec 2012 10:41:39 -0800 Subject: [PATCH] always use old encode/decode from multijson (it only has warnings in 1.3.0-1.3.2) --- lib/fog/core/json.rb | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/lib/fog/core/json.rb b/lib/fog/core/json.rb index 6537d503a..de5d9042d 100644 --- a/lib/fog/core/json.rb +++ b/lib/fog/core/json.rb @@ -21,24 +21,12 @@ module Fog # Do the MultiJson introspection at this level so we can define our encode/decode methods and perform # the introspection only once rather than once per call. - if MultiJson.respond_to?(:dump) - def self.encode(obj) - MultiJson.encode(obj) - end - else - def self.encode(obj) - MultiJson.encode(obj) - end + def self.encode(obj) + MultiJson.encode(obj) end - if MultiJson.respond_to?(:load) - def self.decode(obj) - MultiJson.decode(obj) - end - else - def self.decode(obj) - MultiJson.decode(obj) - end + def self.decode(obj) + MultiJson.decode(obj) end