- Updated File.read_utf to assume String encoding support. (wtn)

[git-p4: depot-paths = "//src/hoe/dev/": change = 14711]

Author: zenspider

lib/hoe.rb

@@ -953,15 +953,8 @@ def maybe_load_yaml path # :nodoc:
 class File # :nodoc:
   # Like File::read, but strips out a BOM marker if it exists.
   def self.read_utf path
-    r19 = "<3".respond_to? :encoding
-    opt = r19 ? "r:bom|utf-8" : "rb"
-
-    open path, opt do |f|
-      if r19 then
-        f.read
-      else
-        f.read.sub %r%\A\xEF\xBB\xBF%, ""
-      end
+    open path, "r:bom|utf-8" do |f|
+      f.read
     end
   end
 end

test/test_hoe.rb

@@ -192,10 +192,7 @@ def test_file_read_utf
 
       content = File.read_utf io.path
       assert_equal "BOM", content
-
-      if content.respond_to? :encoding then
-        assert_equal Encoding::UTF_8, content.encoding
-      end
+      assert_equal Encoding::UTF_8, content.encoding
     end
   end