diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-27 17:48:54 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-27 17:48:54 +0000 |
commit | 0fd221bd781a28f46794d250236ed21da5ae1022 (patch) | |
tree | 28274c5ff1d7415119bbcd7ee8ff9380ce33094c /lib/uri/mailto.rb | |
parent | 7afe0c92ea9f4e363429f3209567b4bc3de302db (diff) | |
download | ruby-0fd221bd781a28f46794d250236ed21da5ae1022.tar.gz |
* lib/uri: don't set @parser if it is DEFAULT_PARSER for marshaling
URI objects between Ruby 1.8 and Ruby 1.9.
[ruby-dev:38377]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/uri/mailto.rb')
-rw-r--r-- | lib/uri/mailto.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb index 4fab6e23a5..240c849e9a 100644 --- a/lib/uri/mailto.rb +++ b/lib/uri/mailto.rb @@ -159,7 +159,7 @@ module URI return true unless v return true if v.size == 0 - if @parser.regexp[:OPAQUE] !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v + if parser.regexp[:OPAQUE] !~ v || /\A#{MAILBOX_PATTERN}*\z/o !~ v raise InvalidComponentError, "bad component(expected opaque component): #{v}" end @@ -183,7 +183,7 @@ module URI return true unless v return true if v.size == 0 - if @parser.regexp[:OPAQUE] !~ v || + if parser.regexp[:OPAQUE] !~ v || /\A(#{HEADER_PATTERN}(?:\&#{HEADER_PATTERN})*)\z/o !~ v raise InvalidComponentError, "bad component(expected opaque component): #{v}" @@ -239,18 +239,18 @@ module URI # # => "To: ruby-list@ruby-lang.org\nSubject: subscribe\nCc: myaddr\n\n\n" # def to_mailtext - to = @parser.unescape(@to) + to = parser.unescape(@to) head = '' body = '' @headers.each do |x| case x[0] when 'body' - body = @parser.unescape(x[1]) + body = parser.unescape(x[1]) when 'to' - to << ', ' + @parser.unescape(x[1]) + to << ', ' + parser.unescape(x[1]) else - head << @parser.unescape(x[0]).capitalize + ': ' + - @parser.unescape(x[1]) + "\n" + head << parser.unescape(x[0]).capitalize + ': ' + + parser.unescape(x[1]) + "\n" end end |