From 95f37c83fb9a11ab750ef59845414fedccee6cce Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 7 Aug 2002 00:47:41 +0000
Subject: * lib/optparse/uri.rb: require standard uri module.  thanks to  
 Minero Aoki.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@2693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/optparse/uri.rb | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'lib/optparse/uri.rb')

diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb
index bba0db209..b24de88b7 100644
--- a/lib/optparse/uri.rb
+++ b/lib/optparse/uri.rb
@@ -1,15 +1,6 @@
 # -*- ruby -*-
 
 require 'optparse'
-unless defined?(URI)
-  begin
-    require 'URI/uri'		# Akira Yamada version.
-  rescue LoadError
-    require 'uri/uri'		# Tomoyuki Kosimizu version.
-  end
-end
-if URI.respond_to?(:parse)
-  OptionParser.accept(URI) {|s| [URI.parse(s)] if s}
-else
-  OptionParser.accept(URI) {|s| [URI.create(s)] if s}
-end
+require 'uri'
+
+OptionParser.accept(URI) {|s| [URI.parse(s)] if s}
-- 
cgit