Check that the yaml library is available before adding YAML to the list of fixture types available

This commit is contained in:
Roberto Rosario
2012-10-06 05:00:50 -04:00
parent 850184ae62
commit 1b23c90a1a

View File

@@ -1,6 +1,12 @@
from __future__ import absolute_import from __future__ import absolute_import
import re import re
try:
import yaml
except ImportError:
YAML_AVAILABLE = False
else:
YAML_AVAILABLE = True
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
@@ -10,7 +16,7 @@ FIXTURE_TYPE_XML = 'xml'
FIXTURE_TYPES_CHOICES = ( FIXTURE_TYPES_CHOICES = (
(FIXTURE_TYPE_JSON, _(u'JSON')), (FIXTURE_TYPE_JSON, _(u'JSON')),
(FIXTURE_TYPE_YAML, _(u'YAML')), #(FIXTURE_TYPE_YAML, _(u'YAML')),
# Disabing XML until a way to specify a null pk is found # Disabing XML until a way to specify a null pk is found
#(FIXTURE_TYPE_XML, _(u'XML')), #(FIXTURE_TYPE_XML, _(u'XML')),
) )
@@ -28,3 +34,6 @@ FIXTURE_TYPE_PK_NULLIFIER = {
} }
COMMAND_LOADDATA = 'loaddata' COMMAND_LOADDATA = 'loaddata'
if YAML_AVAILABLE:
FIXTURE_TYPES_CHOICES += (FIXTURE_TYPE_YAML, _(u'YAML')),