From: Eric Hodel <drbrain@...7.net>
Date: 2007-12-23T16:19:07+09:00
Subject: [PATCH] URI Regexp warnings

The following patch fixes:

warning: encoding option is obsolete - N

in lib/uri.  May I apply it?

Index: lib/uri/mailto.rb
===================================================================
--- lib/uri/mailto.rb	(revision 14512)
+++ lib/uri/mailto.rb	(working copy)
@@ -38,7 +38,7 @@ module URI
      # hvalue     =  *urlc
      # header     =  hname "=" hvalue
      HEADER_PATTERN = "(?:[^?=&]*=[^?=&]*)".freeze
-    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN, 'N').freeze
+    HEADER_REGEXP  = Regexp.new(HEADER_PATTERN).freeze
      # headers    =  "?" header *( "&" header )
      # to         =  #mailbox
      # mailtoURL  =  "mailto:" [ to ] [ headers ]
@@ -55,7 +55,7 @@ module URI
          (#{PATTERN::FRAGMENT})                        (?# 3: fragment)
        )?
        \\z
-    ", Regexp::EXTENDED, 'N').freeze
+    ", Regexp::EXTENDED).freeze
      # :startdoc:

      #
Index: lib/uri/common.rb
===================================================================
--- lib/uri/common.rb	(revision 14512)
+++ lib/uri/common.rb	(working copy)
@@ -186,31 +186,31 @@ module URI

      # for URI::split
      ABS_URI = Regexp.new('^' + PATTERN::X_ABS_URI + '$', #'
-                         Regexp::EXTENDED, 'N').freeze
+                         Regexp::EXTENDED).freeze
      REL_URI = Regexp.new('^' + PATTERN::X_REL_URI + '$', #'
-                         Regexp::EXTENDED, 'N').freeze
+                         Regexp::EXTENDED).freeze

      # for URI::extract
-    URI_REF     = Regexp.new(PATTERN::URI_REF, false, 'N').freeze
-    ABS_URI_REF = Regexp.new(PATTERN::X_ABS_URI, Regexp::EXTENDED,  
'N').freeze
-    REL_URI_REF = Regexp.new(PATTERN::X_REL_URI, Regexp::EXTENDED,  
'N').freeze
+    URI_REF     = Regexp.new(PATTERN::URI_REF, false).freeze
+    ABS_URI_REF = Regexp.new(PATTERN::X_ABS_URI,  
Regexp::EXTENDED).freeze
+    REL_URI_REF = Regexp.new(PATTERN::X_REL_URI,  
Regexp::EXTENDED).freeze

      # for URI::escape/unescape
-    ESCAPED = Regexp.new(PATTERN::ESCAPED, false, 'N').freeze
+    ESCAPED = Regexp.new(PATTERN::ESCAPED, false).freeze
      UNSAFE  =  
Regexp.new("[^#{PATTERN::UNRESERVED}#{PATTERN::RESERVED}]",
-                         false, 'N').freeze
+                         false).freeze

      # for Generic#initialize
-    SCHEME   = Regexp.new("^#{PATTERN::SCHEME}$", false, 'N').freeze #"
-    USERINFO = Regexp.new("^#{PATTERN::USERINFO}$", false,  
'N').freeze #"
-    HOST     = Regexp.new("^#{PATTERN::HOST}$", false, 'N').freeze #"
-    PORT     = Regexp.new("^#{PATTERN::PORT}$", false, 'N').freeze #"
-    OPAQUE   = Regexp.new("^#{PATTERN::OPAQUE_PART}$", false,  
'N').freeze #"
-    REGISTRY = Regexp.new("^#{PATTERN::REG_NAME}$", false,  
'N').freeze #"
-    ABS_PATH = Regexp.new("^#{PATTERN::ABS_PATH}$", false,  
'N').freeze #"
-    REL_PATH = Regexp.new("^#{PATTERN::REL_PATH}$", false,  
'N').freeze #"
-    QUERY    = Regexp.new("^#{PATTERN::QUERY}$", false, 'N').freeze #"
-    FRAGMENT = Regexp.new("^#{PATTERN::FRAGMENT}$", false,  
'N').freeze #"
+    SCHEME   = Regexp.new("^#{PATTERN::SCHEME}$", false).freeze #"
+    USERINFO = Regexp.new("^#{PATTERN::USERINFO}$", false).freeze #"
+    HOST     = Regexp.new("^#{PATTERN::HOST}$", false).freeze #"
+    PORT     = Regexp.new("^#{PATTERN::PORT}$", false).freeze #"
+    OPAQUE   = Regexp.new("^#{PATTERN::OPAQUE_PART}$", false).freeze #"
+    REGISTRY = Regexp.new("^#{PATTERN::REG_NAME}$", false).freeze #"
+    ABS_PATH = Regexp.new("^#{PATTERN::ABS_PATH}$", false).freeze #"
+    REL_PATH = Regexp.new("^#{PATTERN::REL_PATH}$", false).freeze #"
+    QUERY    = Regexp.new("^#{PATTERN::QUERY}$", false).freeze #"
+    FRAGMENT = Regexp.new("^#{PATTERN::FRAGMENT}$", false).freeze #"
      # :startdoc:
    end # REGEXP

@@ -284,7 +284,7 @@ module URI
      def escape(str, unsafe = UNSAFE)
        unless unsafe.kind_of?(Regexp)
          # perhaps unsafe is String object
-        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false, 'N')
+        unsafe = Regexp.new("[#{Regexp.quote(unsafe)}]", false)
        end
        str.gsub(unsafe) do |us|
          tmp = ''