From 89db37cf775340eddc8d3821eb8236b2d8216f0d Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 18 Oct 2015 12:17:52 +0000 Subject: * lib/open-uri.rb: Specify frozen_string_literal: true. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/open-uri.rb | 2 ++ test/open-uri/test_open-uri.rb | 19 +++++++++++-------- test/open-uri/test_ssl.rb | 2 ++ 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c63cbdcb79..735a1cc4ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 18 21:17:27 2015 Tanaka Akira + + * lib/open-uri.rb: Specify frozen_string_literal: true. + Sun Oct 18 14:37:56 2015 KOSAKI Motohiro * random.c (fill_random_bytes_urandom): add a comment why using diff --git a/lib/open-uri.rb b/lib/open-uri.rb index e49a09b192..b8093ad40c 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -1,3 +1,5 @@ +# +# -*- frozen_string_literal: true -*- require 'uri' require 'stringio' require 'time' diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb index e4722576b2..5ad8e5940b 100644 --- a/test/open-uri/test_open-uri.rb +++ b/test/open-uri/test_open-uri.rb @@ -1,3 +1,5 @@ +# +# -*- frozen_string_literal: true -*- require 'test/unit' require 'open-uri' require 'webrick' @@ -11,6 +13,7 @@ class TestOpenURI < Test::Unit::TestCase NullLog = Object.new def NullLog.<<(arg) + #puts arg if / INFO / !~ arg end def with_http(log_tester=lambda {|log| assert_equal([], log) }) @@ -242,9 +245,9 @@ class TestOpenURI < Test::Unit::TestCase def test_proxy with_http {|srv, dr, url| - proxy_log = StringIO.new('') + proxy_log = StringIO.new(''.dup) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) - proxy_auth_log = '' + proxy_auth_log = ''.dup proxy = WEBrick::HTTPProxyServer.new({ :ServerType => Thread, :Logger => proxy_logger, @@ -296,9 +299,9 @@ class TestOpenURI < Test::Unit::TestCase def test_proxy_http_basic_authentication_failure with_http {|srv, dr, url| - proxy_log = StringIO.new('') + proxy_log = StringIO.new(''.dup) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) - proxy_auth_log = '' + proxy_auth_log = ''.dup proxy = WEBrick::HTTPProxyServer.new({ :ServerType => Thread, :Logger => proxy_logger, @@ -329,9 +332,9 @@ class TestOpenURI < Test::Unit::TestCase def test_proxy_http_basic_authentication_success with_http {|srv, dr, url| - proxy_log = StringIO.new('') + proxy_log = StringIO.new(''.dup) proxy_logger = WEBrick::Log.new(proxy_log, WEBrick::BasicLog::WARN) - proxy_auth_log = '' + proxy_auth_log = ''.dup proxy = WEBrick::HTTPProxyServer.new({ :ServerType => Thread, :Logger => proxy_logger, @@ -551,7 +554,7 @@ class TestOpenURI < Test::Unit::TestCase def test_encoding with_http {|srv, dr, url| content_u8 = "\u3042" - content_ej = "\xa2\xa4".force_encoding("euc-jp") + content_ej = "\xa2\xa4".dup.force_encoding("euc-jp") srv.mount_proc("/u8/") {|req, res| res.body = content_u8; res['content-type'] = 'text/plain; charset=utf-8' } srv.mount_proc("/ej/") {|req, res| res.body = content_ej; res['content-type'] = 'TEXT/PLAIN; charset=EUC-JP' } srv.mount_proc("/nc/") {|req, res| res.body = "aa"; res['content-type'] = 'Text/Plain' } @@ -599,7 +602,7 @@ class TestOpenURI < Test::Unit::TestCase def test_content_encoding with_http {|srv, dr, url| content = "abc" * 10000 - Zlib::GzipWriter.wrap(StringIO.new(content_gz="".force_encoding("ascii-8bit"))) {|z| z.write content } + Zlib::GzipWriter.wrap(StringIO.new(content_gz="".dup.force_encoding("ascii-8bit"))) {|z| z.write content } srv.mount_proc("/data/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip' } srv.mount_proc("/data2/") {|req, res| res.body = content_gz; res['content-encoding'] = 'gzip'; res.chunked = true } srv.mount_proc("/noce/") {|req, res| res.body = content_gz } diff --git a/test/open-uri/test_ssl.rb b/test/open-uri/test_ssl.rb index fa40f6db65..12e97add85 100644 --- a/test/open-uri/test_ssl.rb +++ b/test/open-uri/test_ssl.rb @@ -1,3 +1,5 @@ +# +# -*- frozen_string_literal: true -*- require 'test/unit' require 'open-uri' require 'stringio' -- cgit v1.2.3