Skip to content

Commit df17342

Browse files
macro1macro1
committed
Code style updates
1 parent 880292e commit df17342

File tree

8 files changed

+63
-36
lines changed

8 files changed

+63
-36
lines changed

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tests_require = [
55
'Django>=1.4', 'WebTest==2.0.18', 'django-webtest==1.7.8', 'mock==1.0.1']
66
try:
7-
from unittest import skipUnless
7+
from unittest import skipUnless # noqa
88
except ImportError: # Python 2.6 compatibility
99
tests_require.append("unittest2")
1010

‎simple_history/exceptions.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
django-simple-history exceptions and warnings classes.
33
"""
44

5+
56
class MultipleRegistrationsError(Exception):
67
"""The model has been registered to have history tracking more than once"""
78
pass

‎simple_history/management/commands/populate_history.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
from optparse import make_option
2-
31
from django.core.management.base import BaseCommand, CommandError
42

53
try:

‎simple_history/models.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ def finalize(self, sender, **kwargs):
7878
pass
7979
else:
8080
if hint_class is not sender: # set in concrete
81-
if not (self.inherit and issubclass(sender, hint_class)): # set in abstract
82-
return
81+
if not (self.inherit and issubclass(sender, hint_class)):
82+
return # set in abstract
8383
if hasattr(sender._meta, 'simple_history_manager_attribute'):
84-
raise exceptions.MultipleRegistrationsError('{}.{} registered multiple times for history tracking.'.format(
85-
sender._meta.app_label,
86-
sender._meta.object_name,
87-
))
84+
raise exceptions.MultipleRegistrationsError(
85+
'{}.{} registered multiple times for history tracking.'.format(
86+
sender._meta.app_label,
87+
sender._meta.object_name,
88+
)
89+
)
8890
history_model = self.create_history_model(sender)
8991
module = importlib.import_module(self.module)
9092
setattr(module, history_model.__name__, history_model)

‎simple_history/tests/models.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22

33
import django
44
from django.db import models
5+
6+
from simple_history.models import HistoricalRecords
7+
from simple_history import register
8+
59
if django.VERSION >= (1, 5):
610
from .custom_user.models import CustomUser as User
711
else: # django 1.4 compatibility
812
from django.contrib.auth.models import User
913

10-
from simple_history.models import HistoricalRecords
11-
from simple_history import register
12-
1314

1415
class Poll(models.Model):
1516
question = models.CharField(max_length=200)

‎simple_history/tests/tests/test_admin.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from django_webtest import WebTest
55
from django.contrib.admin import AdminSite
66
from django.contrib.messages.storage.fallback import FallbackStorage
7-
from django.db.transaction import atomic
87
from django.test.utils import override_settings
98
from django.test.client import RequestFactory
109
from django import VERSION
@@ -187,8 +186,8 @@ def test_history_user_not_saved(self):
187186
def test_middleware_saves_user(self):
188187
overridden_settings = {
189188
'MIDDLEWARE_CLASSES':
190-
settings.MIDDLEWARE_CLASSES
191-
+ ['simple_history.middleware.HistoryRequestMiddleware'],
189+
settings.MIDDLEWARE_CLASSES +
190+
['simple_history.middleware.HistoryRequestMiddleware'],
192191
}
193192
with override_settings(**overridden_settings):
194193
self.login()
@@ -205,8 +204,8 @@ def test_middleware_saves_user(self):
205204
def test_middleware_unsets_request(self):
206205
overridden_settings = {
207206
'MIDDLEWARE_CLASSES':
208-
settings.MIDDLEWARE_CLASSES
209-
+ ['simple_history.middleware.HistoryRequestMiddleware'],
207+
settings.MIDDLEWARE_CLASSES +
208+
['simple_history.middleware.HistoryRequestMiddleware'],
210209
}
211210
with override_settings(**overridden_settings):
212211
self.login()
@@ -220,8 +219,8 @@ def test_rolled_back_user_does_not_lead_to_foreign_key_error(self):
220219

221220
overridden_settings = {
222221
'MIDDLEWARE_CLASSES':
223-
settings.MIDDLEWARE_CLASSES
224-
+ ['simple_history.middleware.HistoryRequestMiddleware'],
222+
settings.MIDDLEWARE_CLASSES +
223+
['simple_history.middleware.HistoryRequestMiddleware'],
225224
}
226225
with override_settings(**overridden_settings):
227226
self.login()
@@ -242,8 +241,8 @@ def test_rolled_back_user_does_not_lead_to_foreign_key_error(self):
242241
def test_middleware_anonymous_user(self):
243242
overridden_settings = {
244243
'MIDDLEWARE_CLASSES':
245-
settings.MIDDLEWARE_CLASSES
246-
+ ['simple_history.middleware.HistoryRequestMiddleware'],
244+
settings.MIDDLEWARE_CLASSES +
245+
['simple_history.middleware.HistoryRequestMiddleware'],
247246
}
248247
with override_settings(**overridden_settings):
249248
self.app.get(reverse('admin:index'))

‎simple_history/tests/tests/test_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ def test_create_and_delete(self):
8383
def test_multiple(self):
8484
document1 = models.Document.objects.create()
8585
document2 = models.Document.objects.create()
86-
historical = models.Document.history.as_of(datetime.now()
87-
+ timedelta(days=1))
86+
historical = models.Document.history.as_of(
87+
datetime.now() + timedelta(days=1))
8888
self.assertEqual(list(historical), [document1, document2])

‎simple_history/tests/tests/test_models.py

Lines changed: 39 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,9 @@ def test_register_no_args(self):
327327
self.assertEqual(len(choice.history.all()), 1)
328328

329329
def test_register_separate_app(self):
330-
get_history = lambda model: model.history
330+
def get_history(model):
331+
return model.history
332+
331333
self.assertRaises(AttributeError, get_history, User)
332334
self.assertEqual(len(User.histories.all()), 0)
333335
user = User.objects.create(username='bob', password='pass')
@@ -471,7 +473,10 @@ def test_as_of(self):
471473
most_recent = poll.history.most_recent()
472474
self.assertEqual(most_recent.question, "why?")
473475
times = [r.history_date for r in poll.history.all()]
474-
question_as_of = lambda time: poll.history.as_of(time).question
476+
477+
def question_as_of(time):
478+
return poll.history.as_of(time).question
479+
475480
self.assertEqual(question_as_of(times[0]), "why?")
476481
self.assertEqual(question_as_of(times[1]), "how's it going?")
477482
self.assertEqual(question_as_of(times[2]), "what's up?")
@@ -495,7 +500,10 @@ def test_foreignkey_field(self):
495500
most_recent = choice.history.most_recent()
496501
self.assertEqual(most_recent.poll.pk, how_poll.pk)
497502
times = [r.history_date for r in choice.history.all()]
498-
poll_as_of = lambda time: choice.history.as_of(time).poll
503+
504+
def poll_as_of(time):
505+
return choice.history.as_of(time).poll
506+
499507
self.assertEqual(poll_as_of(times[0]).pk, how_poll.pk)
500508
self.assertEqual(poll_as_of(times[1]).pk, why_poll.pk)
501509

@@ -788,41 +796,59 @@ class TestTrackingInheritance(TestCase):
788796

789797
def test_tracked_abstract_base(self):
790798
self.assertEqual(
791-
[f.attname for f in TrackedWithAbstractBase.history.model._meta.fields],
792-
['id', 'history_id', 'history_date', 'history_user_id', 'history_type'],
799+
[
800+
f.attname
801+
for f in TrackedWithAbstractBase.history.model._meta.fields
802+
],
803+
[
804+
'id', 'history_id', 'history_date', 'history_user_id',
805+
'history_type',
806+
],
793807
)
794808

795809
def test_tracked_concrete_base(self):
796810
self.assertEqual(
797-
[f.attname for f in TrackedWithConcreteBase.history.model._meta.fields],
798-
['id', 'trackedconcretebase_ptr_id', 'history_id', 'history_date', 'history_user_id', 'history_type'],
811+
[
812+
f.attname
813+
for f in TrackedWithConcreteBase.history.model._meta.fields
814+
],
815+
[
816+
'id', 'trackedconcretebase_ptr_id', 'history_id',
817+
'history_date', 'history_user_id', 'history_type',
818+
],
799819
)
800820

801821
def test_multiple_tracked_bases(self):
802822
with self.assertRaises(exceptions.MultipleRegistrationsError):
803-
class TrackedWithMultipleAbstractBases(TrackedAbstractBaseA, TrackedAbstractBaseB):
823+
class TrackedWithMultipleAbstractBases(
824+
TrackedAbstractBaseA, TrackedAbstractBaseB):
804825
pass
805826

806827
def test_tracked_abstract_and_untracked_concrete_base(self):
807828
self.assertEqual(
808829
[f.attname for f in InheritTracking1.history.model._meta.fields],
809-
['id', 'untrackedconcretebase_ptr_id', 'history_id', 'history_date', 'history_user_id', 'history_type'],
830+
[
831+
'id', 'untrackedconcretebase_ptr_id', 'history_id',
832+
'history_date', 'history_user_id', 'history_type',
833+
],
810834
)
811835

812836
def test_indirect_tracked_abstract_base(self):
813837
self.assertEqual(
814838
[f.attname for f in InheritTracking2.history.model._meta.fields],
815839
[
816-
'id', 'baseinherittracking2_ptr_id',
817-
'history_id', 'history_date', 'history_user_id', 'history_type'],
840+
'id', 'baseinherittracking2_ptr_id', 'history_id',
841+
'history_date', 'history_user_id', 'history_type',
842+
],
818843
)
819844

820845
def test_indirect_tracked_concrete_base(self):
821846
self.assertEqual(
822847
[f.attname for f in InheritTracking3.history.model._meta.fields],
823848
[
824-
'id', 'baseinherittracking3_ptr_id',
825-
'history_id', 'history_date', 'history_user_id', 'history_type'],
849+
'id', 'baseinherittracking3_ptr_id', 'history_id',
850+
'history_date', 'history_user_id', 'history_type',
851+
],
826852
)
827853

828854
def test_registering_with_tracked_abstract_base(self):

0 commit comments

Comments
 (0)