diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 06:22:53 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-21 06:22:53 +0000 |
commit | a2831955b26a07241c8c45ab2affdbafd4a36db2 (patch) | |
tree | 32969382ba20199d7811f4fed95b178d366fb363 /lib | |
parent | e6484a153038703447b50fcac26349249922ab28 (diff) | |
download | ruby-a2831955b26a07241c8c45ab2affdbafd4a36db2.tar.gz |
lib/open-uri.rb: accept :encoding option as well as encoding in mode string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/open-uri.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/open-uri.rb b/lib/open-uri.rb index b09c18efd9..a68413e8f8 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -108,6 +108,7 @@ module OpenURI :ssl_verify_mode => nil, :ftp_active_mode => false, :redirect => true, + :encoding => nil, } def OpenURI.check_options(options) # :nodoc: @@ -141,6 +142,12 @@ module OpenURI encoding, = $1,Encoding.find($1) if $1 mode = nil end + if options.has_key? :encoding + if !encoding.nil? + raise ArgumentError, "encoding specified twice" + end + encoding = Encoding.find(options[:encoding]) + end unless mode == nil || mode == 'r' || mode == 'rb' || |