summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 09:05:27 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-06-18 09:05:27 +0000
commit1cc37ceed3753ab8988ade7a28e157fa8c761066 (patch)
tree04838c734c18099d7ab2ceb8513bfd55f7c2a01f
parentfded40e54659ce510c5a815236fd926c895a9b70 (diff)
downloadruby-1cc37ceed3753ab8988ade7a28e157fa8c761066.tar.gz
ruby-1cc37ceed3753ab8988ade7a28e157fa8c761066.tar.xz
ruby-1cc37ceed3753ab8988ade7a28e157fa8c761066.zip
* lib/rss/parser.rb: removed a guard for requiring open-uri.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rss/parser.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 76f205662..dcec800f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 18 18:03:50 2006 Kouhei Sutou <kou@cozmixng.org>
+
+ * lib/rss/parser.rb: removed a guard for requiring open-uri.
+
Sun Jun 18 18:01:26 2006 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: fixed typo: except -> expect
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index f7308db59..4482af9d3 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -1,9 +1,5 @@
require "forwardable"
-begin
- require "open-uri"
-rescue LoadError
- require "uri"
-end
+require "open-uri"
require "rss/rss"