Skip to content

Commit

Permalink
bump version, slight pep8 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Brobin committed Jan 18, 2017
1 parent 0323ed0 commit 8f31d21
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 24 deletions.
7 changes: 3 additions & 4 deletions django_seed/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import random


__version__ = '0.1.6'
__version__ = '0.1.7'


class Seed(object):
Expand All @@ -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

Expand All @@ -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
Expand All @@ -44,4 +44,3 @@ def seeder(cls, locale=None):
cls.seeders[code] = seeder.Seeder(faker)

return cls.seeders[code]

2 changes: 1 addition & 1 deletion django_seed/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ class SeederException(Exception):


class SeederCommandError(CommandError):
pass
pass
25 changes: 13 additions & 12 deletions django_seed/guessers.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from .providers import Provider


def _timezone_format(value):
"""
Generates a timezone aware datetime if the 'USE_TZ' setting is enabled
Expand All @@ -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):
Expand Down
8 changes: 3 additions & 5 deletions django_seed/providers.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down Expand Up @@ -55,4 +54,3 @@ def comma_sep_ints(self):
def binary(self):
word = self.faker.text(512)
return str.encode(str(word))

4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

0 comments on commit 8f31d21

Please sign in to comment.