merging from ruby

3 files changed, 14 insertions, 10 deletions

diff --git a/lib/psych.rb b/lib/psych.rb
index 42cd887..58c77f4 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -191,21 +191,12 @@ module Psych
   # Load multiple documents given in +yaml+.  Returns the parsed documents
   # as a list.  For example:
   #
-  #   Psych.load_documents("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
+  #   Psych.load_stream("--- foo\n...\n--- bar\n...") # => ['foo', 'bar']
   #
   def self.load_stream yaml
     parse_stream(yaml).children.map { |child| child.to_ruby }
   end
 
-  def self.load_documents yaml, &block
-    if $VERBOSE
-      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
-    end
-    list = load_stream yaml
-    return list unless block_given?
-    list.each(&block)
-  end
-
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a ruby object
diff --git a/lib/psych/deprecated.rb b/lib/psych/deprecated.rb
index 26e431d..093f145 100644
--- a/lib/psych/deprecated.rb
+++ b/lib/psych/deprecated.rb
@@ -20,6 +20,16 @@ module Psych
     end
     target.psych_to_yaml unless opts[:nodump]
   end
+
+  def self.load_documents yaml, &block
+    if $VERBOSE
+      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
+    end
+    list = load_stream yaml
+    return list unless block_given?
+    list.each(&block)
+  end
+
 end
 
 class Object
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index f1fa7f9..45cd39d 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -10,6 +10,9 @@ module Psych_Tests
 end
 
 class Psych_Unit_Tests < Psych::TestCase
+    def teardown
+        Psych.domain_types.clear
+    end
 	#
 	# Tests modified from 00basic.t in Psych.pm
 	#