From 0a85c658591d8b0763423a419dd96a9b957c3918 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: [PATCH] * lib/optparse/uri.rb: require standard uri module.  thanks
 to   Minero Aoki.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  5 +++++
 lib/optparse/uri.rb | 15 +++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 451734964c..3be1d15b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug  7 09:45:24 2002  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
+
+	* lib/optparse/uri.rb: require standard uri module.  thanks to
+	  Minero Aoki.
+
 Wed Aug  7 08:44:32 2002  Minero Aoki  <aamine@loveruby.net>
 
 	* ext/racc/cparse/cparse.c: reduce goto.
diff --git a/lib/optparse/uri.rb b/lib/optparse/uri.rb
index bba0db209d..b24de88b76 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}