* lib/rss/2.0.rb, lib/rss/content.rb, lib/rss/dublincore.rb,

  lib/rss/rss.rb, lib/rss/syndication.rb: removed warnings.

* lib/rss/converter.rb: removed handling load error of nkf.

* test/rss/test_syndication.rb, test/rss/test_trackback.rb,
  test/rss/test_dublincore.rb, test/rss/test_content.rb: replaced
	'require "rss/parser"' by 'require "rss/1.0"'.

* test/rss/test_parser.rb, test/rss/test_accessor.rb: removed
  'require "rss/parser"'.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 20 deletions

diff --git a/lib/rss/converter.rb b/lib/rss/converter.rb
index 144daab564..4f00c86973 100644
--- a/lib/rss/converter.rb
+++ b/lib/rss/converter.rb
@@ -111,44 +111,28 @@ EOC
 		end
 		
 		def def_to_euc_jp_from_shift_jis
-      begin
-        require "nkf"
-      rescue LoadError
-        raise UnknownConversionMethodError.new('EUC-JP', 'Shift_JIS')
-      end
+			require "nkf"
 			def_convert do |value|
 				"NKF.nkf('-Se', #{value})"
 			end
 		end
 		
 		def def_to_shift_jis_from_euc_jp
-      begin
-        require "nkf"
-      rescue LoadError
-        raise UnknownConversionMethodError.new('Shift_JIS', 'EUC-JP')
-      end
+			require "nkf"
 			def_convert do |value|
 				"NKF.nkf('-Es', #{value})"
 			end
 		end
 		
 		def def_to_euc_jp_from_iso_2022_jp
-      begin
-        require "nkf"
-      rescue LoadError
-        raise UnknownConversionMethodError.new('EUC-JP', 'ISO-2022-JP')
-      end
+			require "nkf"
 			def_convert do |value|
 				"NKF.nkf('-Je', #{value})"
 			end
 		end
 		
 		def def_to_iso_2022_jp_from_euc_jp
-      begin
-        require "nkf"
-      rescue LoadError
-        raise UnknownConversionMethodError.new('ISO-2022-JP', 'EUC-JP')
-      end
+			require "nkf"
 			def_convert do |value|
 				"NKF.nkf('-Ej', #{value})"
 			end