Merge branch 'master' of git://github.com/oortle/ratom into oortle/ma…

…ster
DanielVartanov · Mar 18, 2009 · 2a94cd5 · 2a94cd5
2 parents 3456df8 + 97f9d1b
commit 2a94cd5
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/atom/xml/parser.rb b/lib/atom/xml/parser.rb
@@ -261,9 +261,9 @@ def loadable!(&error_handler)
                xml = 
                 case o
                 when String
-                  XML::Reader.new(o)
+                  XML::Reader.string(o)
                 when IO
-                  XML::Reader.new(o.read)
+                  XML::Reader.io(o.read)
                 when URI
                   raise ArgumentError, "#{class_name}.load only handles http URIs" if o.scheme != 'http'
                   response = nil
@@ -283,7 +283,7 @@ def loadable!(&error_handler)
                   end
                   case response
                   when Net::HTTPSuccess
-                    XML::Reader.new(response.body)
+                    XML::Reader.string(response.body)
                   when nil
                     raise ArgumentError.new("nil response to #{o}")
                   else
@@ -294,9 +294,9 @@ def loadable!(&error_handler)
                 end
 
                 if error_handler
-                  xml.set_error_handler(&error_handler)
+                  XML::Error.set_handler(&error_handler)
                 else
-                  xml.set_error_handler do |reader, message, severity, base, line|
+                  XML::Error.set_handler do |reader, message, severity, base, line|
                     if severity == XML::Reader::SEVERITY_ERROR
                       raise ParseError, "#{message} at #{line} in #{o}"
                     end