* lib/rubygems/digest/digest_adapter.rb: removed.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22789 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 3 insertions, 60 deletions

diff --git a/lib/rubygems/digest/digest_adapter.rb b/lib/rubygems/digest/digest_adapter.rb
deleted file mode 100755
index a62c5300c8..0000000000
--- a/lib/rubygems/digest/digest_adapter.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-module Gem
-
-  # There is an incompatibility between the way Ruby 1.8.5 and 1.8.6
-  # handles digests. This DigestAdapter will take a pre-1.8.6 digest
-  # and adapt it to the 1.8.6 API.
-  #
-  # Note that only the digest and hexdigest methods are adapted,
-  # since these are the only functions used by Gems.
-  #
-  class DigestAdapter
-
-    # Initialize a digest adapter.
-    def initialize(digest_class)
-      @digest_class = digest_class
-    end
-
-    # Return a new digester.  Since we are only implementing the stateless
-    # methods, we will return ourself as the instance.
-    def new
-      self
-    end
-
-    # Return the digest of +string+ as a hex string.
-    def hexdigest(string)
-      @digest_class.new(string).hexdigest
-    end
-
-    # Return the digest of +string+ as a binary string.
-    def digest(string)
-      @digest_class.new(string).digest
-    end
-  end
-end
diff --git a/lib/rubygems/digest/md5.rb b/lib/rubygems/digest/md5.rb
index 477301a783..2bc8f9c138 100755
--- a/lib/rubygems/digest/md5.rb
+++ b/lib/rubygems/digest/md5.rb
@@ -8,14 +8,6 @@ require 'digest/md5'
 
 # :stopdoc:
 module Gem
-  if RUBY_VERSION >= '1.8.6'
-    MD5 = Digest::MD5
-  else
-    require 'rubygems/digest/digest_adapter'
-    MD5 = DigestAdapter.new(Digest::MD5)
-    def MD5.md5(string)
-      self.hexdigest(string)
-    end
-  end
+  MD5 = Digest::MD5
 end
 # :startdoc:
diff --git a/lib/rubygems/digest/sha1.rb b/lib/rubygems/digest/sha1.rb
index 7ae69eb89a..2d91c0f45a 100755
--- a/lib/rubygems/digest/sha1.rb
+++ b/lib/rubygems/digest/sha1.rb
@@ -7,10 +7,5 @@
 require 'digest/sha1'
 
 module Gem
-  if RUBY_VERSION >= '1.8.6'
-    SHA1 = Digest::SHA1
-  else
-    require 'rubygems/digest/digest_adapter'
-    SHA1 = DigestAdapter.new(Digest::SHA1)
-  end
+  SHA1 = Digest::SHA1
 end
diff --git a/lib/rubygems/digest/sha2.rb b/lib/rubygems/digest/sha2.rb
index 3bb107773f..91cb236165 100755
--- a/lib/rubygems/digest/sha2.rb
+++ b/lib/rubygems/digest/sha2.rb
@@ -7,10 +7,5 @@
 require 'digest/sha2'
 
 module Gem
-  if RUBY_VERSION >= '1.8.6'
-    SHA256 = Digest::SHA256
-  else
-    require 'rubygems/digest/digest_adapter'
-    SHA256 = DigestAdapter.new(Digest::SHA256)
-  end
+  SHA256 = Digest::SHA256
 end