diff options
| author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 00:11:27 +0000 |
|---|---|---|
| committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 00:11:27 +0000 |
| commit | 26f23f7818f31ef9b4f555e677d82842e99a6f08 (patch) | |
| tree | d66320a32b7d4aa717def3c4f80c313dcb97abf2 | |
| parent | 63e0e8a0f3344c19aa9b906c80c16a0b26ccb72e (diff) | |
| download | ruby-26f23f7818f31ef9b4f555e677d82842e99a6f08.tar.gz ruby-26f23f7818f31ef9b4f555e677d82842e99a6f08.tar.xz ruby-26f23f7818f31ef9b4f555e677d82842e99a6f08.zip | |
* lib/rss, test/rss: backported from trunk. (2005-11-16 - now)
* lib/rss/rss.rb : removed needless argument 'prefix'.
* lib/rss/parser.rb: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | lib/rss/parser.rb | 4 | ||||
| -rw-r--r-- | lib/rss/rss.rb | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -8,6 +8,9 @@ Sat Jun 17 09:03:47 2006 Kouhei Sutou <kou@cozmixng.org> * lib/rss/trackback.rb: added TrackBack prefix. * lib/rss/maker/trackback.rb: ditto. + * lib/rss/rss.rb : removed needless argument 'prefix'. + * lib/rss/parser.rb: ditto. + Sat Jun 17 02:01:00 2006 Tanaka Akira <akr@m17n.org> * lib/pp.rb (Kernel#pretty_inspect): defined for pretty printed diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb index 6b3fe0641..3904feb75 100644 --- a/lib/rss/parser.rb +++ b/lib/rss/parser.rb @@ -407,9 +407,7 @@ module RSS previous = @last_element next_element = klass.send(:new, *args) next_element.do_validate = @do_validate - prefix = "" - prefix << "#{klass.required_prefix}_" if klass.required_prefix - previous.instance_eval {set_next_element(prefix, tag_name, next_element)} + previous.instance_eval {set_next_element(tag_name, next_element)} @last_element = next_element @proc_stack.push Proc.new { |text, tags| p(@last_element.class) if DEBUG diff --git a/lib/rss/rss.rb b/lib/rss/rss.rb index fc0cd7b1c..d2b760448 100644 --- a/lib/rss/rss.rb +++ b/lib/rss/rss.rb @@ -665,7 +665,7 @@ EOC end end - def set_next_element(prefix, tag_name, next_element) + def set_next_element(tag_name, next_element) klass = next_element.class prefix = "" prefix << "#{klass.required_prefix}_" if klass.required_prefix |