Index: pyyaml/trunk/lib/yaml/__init__.py
===================================================================
--- pyyaml/trunk/lib/yaml/__init__.py	(revision 252)
+++ pyyaml/trunk/lib/yaml/__init__.py	(revision 258)
@@ -36,6 +36,5 @@
     """
     loader = Loader(stream)
-    if loader.check_node():
-        return loader.get_node()
+    return loader.get_single_node()
 
 def compose_all(stream, Loader=Loader):
@@ -48,4 +47,12 @@
         yield loader.get_node()
 
+def load(stream, Loader=Loader):
+    """
+    Parse the first YAML document in a stream
+    and produce the corresponding Python object.
+    """
+    loader = Loader(stream)
+    return loader.get_single_data()
+
 def load_all(stream, Loader=Loader):
     """
@@ -57,12 +64,11 @@
         yield loader.get_data()
 
-def load(stream, Loader=Loader):
+def safe_load(stream):
     """
     Parse the first YAML document in a stream
     and produce the corresponding Python object.
-    """
-    loader = Loader(stream)
-    if loader.check_data():
-        return loader.get_data()
+    Resolve only basic YAML tags.
+    """
+    return load(stream, SafeLoader)
 
 def safe_load_all(stream):
@@ -73,12 +79,4 @@
     """
     return load_all(stream, SafeLoader)
-
-def safe_load(stream):
-    """
-    Parse the first YAML document in a stream
-    and produce the corresponding Python object.
-    Resolve only basic YAML tags.
-    """
-    return load(stream, SafeLoader)
 
 def emit(events, stream=None, Dumper=Dumper,