diff -r 6641e941ef1e -r ff1a9aa48cfd app/django/core/serializers/pyyaml.py --- a/app/django/core/serializers/pyyaml.py Tue Oct 14 12:36:55 2008 +0000 +++ b/app/django/core/serializers/pyyaml.py Tue Oct 14 16:00:59 2008 +0000 @@ -4,14 +4,12 @@ Requires PyYaml (http://pyyaml.org/), but that's checked for in __init__. """ +from StringIO import StringIO +import yaml + from django.db import models from django.core.serializers.python import Serializer as PythonSerializer from django.core.serializers.python import Deserializer as PythonDeserializer -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO -import yaml class Serializer(PythonSerializer): """