diff --git a/django_seed/__init__.py b/django_seed/__init__.py index 4f254cc..5f2dab7 100644 --- a/django_seed/__init__.py +++ b/django_seed/__init__.py @@ -2,7 +2,7 @@ import random -__version__ = '0.1.6' +__version__ = '0.1.7' class Seed(object): @@ -22,7 +22,7 @@ def __init__(self): @staticmethod def codename(locale=None): from django.conf import settings - locale = locale or getattr(settings,'LANGUAGE_CODE', None) + locale = locale or getattr(settings, 'LANGUAGE_CODE', None) codename = locale or 'default' return codename @@ -32,7 +32,7 @@ def faker(cls, locale=None, codename=None): if code not in cls.fakers: from faker import Faker cls.fakers[code] = Faker(locale) - cls.fakers[code].seed(random.randint(1,10000)) + cls.fakers[code].seed(random.randint(1, 10000)) return cls.fakers[code] @classmethod @@ -44,4 +44,3 @@ def seeder(cls, locale=None): cls.seeders[code] = seeder.Seeder(faker) return cls.seeders[code] - diff --git a/django_seed/exceptions.py b/django_seed/exceptions.py index 904f61d..2f2be33 100644 --- a/django_seed/exceptions.py +++ b/django_seed/exceptions.py @@ -6,4 +6,4 @@ class SeederException(Exception): class SeederCommandError(CommandError): - pass \ No newline at end of file + pass diff --git a/django_seed/guessers.py b/django_seed/guessers.py index 8241812..e8545a7 100644 --- a/django_seed/guessers.py +++ b/django_seed/guessers.py @@ -7,6 +7,7 @@ from .providers import Provider + def _timezone_format(value): """ Generates a timezone aware datetime if the 'USE_TZ' setting is enabled @@ -29,23 +30,23 @@ def guess_format(self, name): """ name = name.lower() faker = self.faker - if re.findall(r'^is[_A-Z]', name): return lambda x:faker.boolean() + if re.findall(r'^is[_A-Z]', name): return lambda x: faker.boolean() elif re.findall(r'(_a|A)t$', name): return lambda x: _timezone_format(faker.date_time()) if name in ('first_name', 'firstname', 'first'): return lambda x: faker.first_name() if name in ('last_name', 'lastname', 'last'): return lambda x: faker.last_name() - if name in ('username','login','nickname'): return lambda x:faker.user_name() - if name in ('email','email_address'): return lambda x:faker.email() - if name in ('phone_number','phonenumber','phone'): return lambda x:faker.phone_number() - if name == 'address' : return lambda x:faker.address() - if name == 'city' : return lambda x: faker.city() - if name == 'streetaddress' : return lambda x: faker.street_address() - if name in ('postcode','zipcode'): return lambda x: faker.postcode() - if name == 'state' : return lambda x: faker.state() - if name == 'country' : return lambda x: faker.country() - if name == 'title' : return lambda x: faker.sentence() - if name in ('body','summary', 'description'): return lambda x: faker.text() + if name in ('username', 'login', 'nickname'): return lambda x:faker.user_name() + if name in ('email', 'email_address'): return lambda x:faker.email() + if name in ('phone_number', 'phonenumber', 'phone'): return lambda x:faker.phone_number() + if name == 'address': return lambda x:faker.address() + if name == 'city': return lambda x: faker.city() + if name == 'streetaddress': return lambda x: faker.street_address() + if name in ('postcode', 'zipcode'): return lambda x: faker.postcode() + if name == 'state': return lambda x: faker.state() + if name == 'country': return lambda x: faker.country() + if name == 'title': return lambda x: faker.sentence() + if name in ('body', 'summary', 'description'): return lambda x: faker.text() class FieldTypeGuesser(object): diff --git a/django_seed/providers.py b/django_seed/providers.py index 4accfd4..a70f80e 100644 --- a/django_seed/providers.py +++ b/django_seed/providers.py @@ -1,15 +1,14 @@ from datetime import timedelta import random -import struct import time import uuid import sys -file_extensions = ( "flac", "mp3", "wav", "bmp", "gif", "jpeg", "jpg", "png", - "tiff", "css", "csv", "html", "js", "json", "txt", "mp4", - "avi", "mov", "webm" ) +file_extensions = ("flac", "mp3", "wav", "bmp", "gif", "jpeg", "jpg", "png", + "tiff", "css", "csv", "html", "js", "json", "txt", "mp4", + "avi", "mov", "webm") class Provider(object): @@ -55,4 +54,3 @@ def comma_sep_ints(self): def binary(self): word = self.faker.text(512) return str.encode(str(word)) - diff --git a/setup.py b/setup.py index 5b99be7..3a2f918 100644 --- a/setup.py +++ b/setup.py @@ -56,8 +56,8 @@ def find_version(*file_paths): ], keywords='faker fixtures data test django seed', long_description=open('README.rst', 'r').read(), - install_requires=['django>=1.8','Faker>=0.7.7'], - tests_require=['django>=1.8','fake-factory>=0.5.0', 'coverage', 'django-nose'], + install_requires=['django>=1.8', 'Faker>=0.7.7'], + tests_require=['django>=1.8', 'fake-factory>=0.5.0', 'coverage', 'django-nose'], test_suite="runtests.runtests", zip_safe=False, )