From 68ebd56a76423c14883f8986fd6e64cf6da314d5 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 8 Aug 2024 11:06:03 +0900
Subject: [PATCH] [ruby/uri] Use URI::RFC2396_PARSER explicitly in URI

https://github.com/ruby/uri/commit/898b889811
---
 lib/uri/generic.rb      | 4 ++--
 test/uri/test_parser.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/uri/generic.rb b/lib/uri/generic.rb
index bdd366661e..7b48c9b9b8 100644
--- a/lib/uri/generic.rb
+++ b/lib/uri/generic.rb
@@ -82,7 +82,7 @@ module URI
         if args.kind_of?(Array)
           return self.build(args.collect{|x|
             if x.is_a?(String)
-              DEFAULT_PARSER.escape(x)
+              URI::RFC2396_PARSER.escape(x)
             else
               x
             end
@@ -91,7 +91,7 @@ module URI
           tmp = {}
           args.each do |key, value|
             tmp[key] = if value
-                DEFAULT_PARSER.escape(value)
+                URI::RFC2396_PARSER.escape(value)
               else
                 value
               end
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
index 9105d47f7b..f455a5cc9b 100644
--- a/test/uri/test_parser.rb
+++ b/test/uri/test_parser.rb
@@ -69,8 +69,8 @@ class URI::TestParser < Test::Unit::TestCase
     end
   end
 
-  def test_unescape
-    p1 = URI::Parser.new
+  def test_rfc2822_unescape
+    p1 = URI::RFC2396_Parser.new
     assert_equal("\xe3\x83\x90", p1.unescape("\xe3\x83\x90"))
     assert_equal("\xe3\x83\x90", p1.unescape('%e3%83%90'))
     assert_equal("\u3042", p1.unescape('%e3%81%82'.force_encoding(Encoding::US_ASCII)))