summaryrefslogtreecommitdiff
path: root/lib/rubygems/uri_formatter.rb
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-16 00:14:16 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-10-16 00:14:16 +0000
commit28918eac58eb6e2681d10839ac0d1430b2a4f1f9 (patch)
tree3c2c9e36118efe1d9406acdd14c186788879bea3 /lib/rubygems/uri_formatter.rb
parentcfe1458078b8cf36e490c516977c52e1faa9e88a (diff)
* lib/rubygems: Update to RubyGems master commit 2a74263. This fixes
several bugs in RubyGems 2.2.0.preview.1. * test/rubygems: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43298 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/uri_formatter.rb')
-rw-r--r--lib/rubygems/uri_formatter.rb16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/rubygems/uri_formatter.rb b/lib/rubygems/uri_formatter.rb
index deac3bfe75..935d9b52ed 100644
--- a/lib/rubygems/uri_formatter.rb
+++ b/lib/rubygems/uri_formatter.rb
@@ -1,3 +1,4 @@
+require 'cgi'
require 'uri'
class Gem::UriFormatter
@@ -9,7 +10,7 @@ class Gem::UriFormatter
def escape
return unless @uri
- escaper.escape @uri
+ CGI.escape @uri
end
##
@@ -21,18 +22,7 @@ class Gem::UriFormatter
def unescape
return unless @uri
- escaper.unescape @uri
- end
-
- private
-
- def escaper
- @uri_parser ||=
- begin
- URI::Parser.new
- rescue NameError
- URI
- end
+ CGI.unescape @uri
end
end