Vendor uri gem in RubyGems

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/rubygems/optparse/lib/optparse.rb b/lib/rubygems/optparse/lib/optparse.rb
index 8e700016b0..42370bf7cc 100644
--- a/lib/rubygems/optparse/lib/optparse.rb
+++ b/lib/rubygems/optparse/lib/optparse.rb
@@ -158,7 +158,7 @@
 # - Date  -- Anything accepted by +Date.parse+ (need to require +optparse/date+)
 # - DateTime -- Anything accepted by +DateTime.parse+ (need to require +optparse/date+)
 # - Time -- Anything accepted by +Time.httpdate+ or +Time.parse+ (need to require +optparse/time+)
-# - URI  -- Anything accepted by +URI.parse+ (need to require +optparse/uri+)
+# - URI  -- Anything accepted by +Gem::URI.parse+ (need to require +optparse/uri+)
 # - Shellwords -- Anything accepted by +Shellwords.shellwords+ (need to require +optparse/shellwords+)
 # - String -- Any non-empty string
 # - Integer -- Any integer. Will convert octal. (e.g. 124, -3, 040)
diff --git a/lib/rubygems/optparse/lib/optparse/uri.rb b/lib/rubygems/optparse/lib/optparse/uri.rb
index 664d7f2af4..5c2d0b8514 100644
--- a/lib/rubygems/optparse/lib/optparse/uri.rb
+++ b/lib/rubygems/optparse/lib/optparse/uri.rb
@@ -2,6 +2,6 @@
 # -*- ruby -*-
 
 require_relative '../optparse'
-require 'uri'
+require_relative '../../../vendor/uri/lib/uri'
 
-Gem::OptionParser.accept(URI) {|s,| URI.parse(s) if s}
+Gem::OptionParser.accept(Gem::URI) {|s,| Gem::URI.parse(s) if s}