Feature/fix install

django_faker/__init__.py

@@ -3,11 +3,6 @@
 Django-faker uses python-faker to generate test data for Django models and templates.
 
 """
-
-
-
-__version__ = '0.2.1'
-
 class Faker(object):
 
     instance = None
@@ -32,9 +27,9 @@ def getCodename(locale=None, providers=None):
         """
         from django.conf import settings
         # language
-        locale = locale or getattr(settings,'FAKER_LOCALE', getattr(settings,'LANGUAGE_CODE', None))
+        locale = locale or getattr(settings, 'FAKER_LOCALE', getattr(settings, 'LANGUAGE_CODE', None))
         # providers
-        providers = providers or getattr(settings,'FAKER_PROVIDERS', None)
+        providers = providers or getattr(settings, 'FAKER_PROVIDERS', None)
 
         codename = locale or 'default'
 
@@ -102,9 +97,9 @@ def getPopulator(cls, locale=None, providers=None):
 #            # initialize with faker.generator.Generator instance
 #            FakerGenerator(
 #
-#                getattr(settings,'FAKER_LOCALE', getattr(settings,'LANGUAGE_CODE', locale)),
+#                getattr(settings, 'FAKER_LOCALE', getattr(settings, 'LANGUAGE_CODE', locale)),
 #
-#                getattr(settings,'FAKER_PROVIDERS', providers)
+#                getattr(settings, 'FAKER_PROVIDERS', providers)
 #            )
 #        )
 

django_faker/templatetags/fakers.py

@@ -1,6 +1,7 @@
 from inspect import getargspec
 from django import template
-from django.template.base import TagHelperNode, TemplateSyntaxError, parse_bits
+from django.template.library import TagHelperNode, parse_bits
+from django.template.exceptions import TemplateSyntaxError
 
 register = template.Library()
 

django_faker/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from django.views.generic import TemplateView
 
-urlpatterns = patterns('',
+urlpatterns = [
     url(r'^preview.html$', TemplateView.as_view(template_name='faker/preview.html'))
-)
+]

django_faker/version.py

@@ -0,0 +1 @@
+__version__ = '0.2.1'

setup.py

@@ -1,6 +1,6 @@
 import os
 from setuptools import setup, find_packages
-
+from django_faker.version import __version__
 
 def read_file(filename):
     """Read a file into a string"""
@@ -14,7 +14,7 @@ def read_file(filename):
 
 setup(
     name='django-faker',
-    version=__import__('django_faker').__version__,
+    version=__version__,
     author='joke2k',
     author_email='joke2k@gmail.com',
     packages=find_packages(),