diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/optparse/uri.rb | 15 |
2 files changed, 8 insertions, 12 deletions
@@ -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} |