Merge pull request #7 from rickypai/dont_depend_on_marshal_patch

Dont depend on marshal patch
twitter-archive · Apr 1, 2014 · 7832e09 · 7832e09
2 parents 33d4bec + fcd7e2a
commit 7832e09
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.7.2
+0.7.3
diff --git a/kestrel-client.gemspec b/kestrel-client.gemspec
@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "kestrel-client"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Freels", "Rael Dornfest"]

diff --git a/lib/kestrel/client/unmarshal.rb b/lib/kestrel/client/unmarshal.rb
@@ -6,12 +6,12 @@ def get(key, opts = {})
         return response if opts[:raw]
 
         if is_marshaled?(response)
-          Marshal.load_with_constantize(response, loaded_constants = [])
+          Marshal.load(response)
         else
           response
         end
       end
-      
+
       if RUBY_VERSION.respond_to?(:getbyte)
         def is_marshaled?(object)
           o = object.to_s