hsbt	2014-08-08 19:30:19 +0900 (Fri, 08 Aug 2014)

  New Revision: 47103

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47103

  Log:
    * lib/open-uri.rb: remove needless condition for old ruby version.
    * test/open-uri/test_open-uri.rb: ditto.

  Modified files:
    trunk/ChangeLog
    trunk/lib/open-uri.rb
    trunk/test/open-uri/test_open-uri.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 47102)
+++ ChangeLog	(revision 47103)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Aug  8 17:19:57 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* lib/open-uri.rb: remove needless condition for old ruby version.
+	* test/open-uri/test_open-uri.rb: ditto.
+
 Fri Aug  8 16:40:59 2014  SHIBATA Hiroshi  <shibata.hiroshi@g...>
 
 	* lib/irb/init.rb: removed unreachable code.
Index: lib/open-uri.rb
===================================================================
--- lib/open-uri.rb	(revision 47102)
+++ lib/open-uri.rb	(revision 47103)
@@ -256,8 +256,7 @@ module OpenURI https://github.com/ruby/ruby/blob/trunk/lib/open-uri.rb#L256
       raise "Non-HTTP proxy URI: #{proxy_uri}" if proxy_uri.class != URI::HTTP
     end
 
-    if target.userinfo && "1.9.0" <= RUBY_VERSION
-      # don't raise for 1.8 because compatibility.
+    if target.userinfo
       raise ArgumentError, "userinfo not supported.  [RFC3986]"
     end
 
Index: test/open-uri/test_open-uri.rb
===================================================================
--- test/open-uri/test_open-uri.rb	(revision 47102)
+++ test/open-uri/test_open-uri.rb	(revision 47103)
@@ -401,9 +401,7 @@ class TestOpenURI < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/open-uri/test_open-uri.rb#L401
   end
 
   def test_userinfo
-    if "1.9.0" <= RUBY_VERSION
-      assert_raise(ArgumentError) { open("http://user:pass@1.../") {} }
-    end
+    assert_raise(ArgumentError) { open("http://user:pass@1.../") {} }
   end
 
   def test_progress

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/