--- pyyaml.py-svn	2010-02-19 14:50:43.000000000 +0100
+++ pyyaml.py-svn-modified	2010-02-19 14:56:08.000000000 +0100
@@ -12,7 +12,14 @@
 from django.core.serializers.python import Serializer as PythonSerializer
 from django.core.serializers.python import Deserializer as PythonDeserializer
 
-class DjangoSafeDumper(yaml.SafeDumper):
+# Use the C (faster) implementation if possible
+try:
+    from yaml import CLoader as Loader
+    from yaml import CSafeDumper as SafeDumper
+except ImportError:
+    from yaml import Loader, SafeDumper
+
+class DjangoSafeDumper(SafeDumper):
     def represent_decimal(self, data):
         return self.represent_scalar('tag:yaml.org,2002:str', str(data))
 
@@ -54,6 +61,6 @@
         stream = StringIO(stream_or_string)
     else:
         stream = stream_or_string
-    for obj in PythonDeserializer(yaml.load(stream), **options):
+    for obj in PythonDeserializer(yaml.load(stream, Loader=Loader), **options):
         yield obj