Merge branch 'master' of github.com:joke2k/django-faker

joke2k · Sep 26, 2015 · 345e3ee · 345e3ee
2 parents 757f2ab + 5c66449
commit 345e3ee
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/django_faker/__init__.py b/django_faker/__init__.py
@@ -3,9 +3,10 @@
 Django-faker uses python-faker to generate test data for Django models and templates.
 
 """
-from django.conf import settings
 
-__version__ = '0.2'
+
+
+__version__ = '0.2.1'
 
 class Faker(object):
 
@@ -29,6 +30,7 @@ def getCodename(locale=None, providers=None):
         """
         codename = locale[-Provider]*
         """
+        from django.conf import settings
         # language
         locale = locale or getattr(settings,'FAKER_LOCALE', getattr(settings,'LANGUAGE_CODE', None))
         # providers