diff options
author | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-05 07:37:47 +0000 |
---|---|---|
committer | ktsj <ktsj@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-05 07:37:47 +0000 |
commit | c3749b6a6da86243ca16ed058216114e71c184f3 (patch) | |
tree | db06109ff283e6a9abc0ffa7f905598aa106b61d /lib/rss | |
parent | 0e68c46e2dc4ae6603f9dd53a2048c6d8bddea10 (diff) |
* ext/pathname/lib/pathname.rb, ext/tk/lib/multi-tk.rb,
ext/tk/sample/demos-en/widget, lib/benchmark.rb, lib/irb/cmd/fork.rb,
lib/mkmf.rb, lib/net/ftp.rb, lib/net/smtp.rb, lib/open3.rb,
lib/pstore.rb, lib/rexml/element.rb, lib/rexml/light/node.rb,
lib/rinda/tuplespace.rb, lib/rss/maker/base.rb,
lib/rss/maker/entry.rb, lib/scanf.rb, lib/set.rb, lib/shell.rb,
lib/shell/command-processor.rb, lib/shell/process-controller.rb,
lib/shell/system-command.rb, lib/uri/common.rb: remove unused block
arguments to avoid creating Proc objects.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33638 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rss')
-rw-r--r-- | lib/rss/maker/base.rb | 8 | ||||
-rw-r--r-- | lib/rss/maker/entry.rb | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/rss/maker/base.rb b/lib/rss/maker/base.rb index fa2b02d101..a776f47adc 100644 --- a/lib/rss/maker/base.rb +++ b/lib/rss/maker/base.rb @@ -353,7 +353,7 @@ module RSS module SetupDefaultDate private - def _set_default_values(&block) + def _set_default_values keep = { :date => date, :dc_dates => dc_dates.to_a.dup, @@ -365,7 +365,7 @@ module RSS dc_dates.unshift(dc_date) end self.date ||= self.dc_date - super(&block) + super ensure date = keep[:date] dc_dates.replace(keep[:dc_dates]) @@ -379,7 +379,7 @@ module RSS module SetupDefaultLanguage private - def _set_default_values(&block) + def _set_default_values keep = { :dc_languages => dc_languages.to_a.dup, } @@ -390,7 +390,7 @@ module RSS dc_language.value = _language.dup dc_languages.unshift(dc_language) end - super(&block) + super ensure dc_languages.replace(keep[:dc_languages]) end diff --git a/lib/rss/maker/entry.rb b/lib/rss/maker/entry.rb index b35936b208..f8f5469f2c 100644 --- a/lib/rss/maker/entry.rb +++ b/lib/rss/maker/entry.rb @@ -99,7 +99,7 @@ module RSS end end - def _set_default_values(&block) + def _set_default_values keep = { :authors => authors.to_a.dup, :contributors => contributors.to_a.dup, @@ -126,7 +126,7 @@ module RSS @maker.channel.title {|t| @title = t} end self.updated ||= @maker.channel.updated - super(&block) + super ensure authors.replace(keep[:authors]) contributors.replace(keep[:contributors]) |