From 413c1745c829ea3dc6b59ce0d7621f62ea0b3cad Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 19 Oct 2012 22:53:27 +0100 Subject: [PATCH] Quick pylint cleanup --- django_ett/etasks/api.py | 12 ++++++------ django_ett/etasks/models.py | 15 ++++++++------- django_ett/etasks/tests.py | 6 +++--- django_ett/etasks/urls.py | 1 - django_ett/etasks/views.py | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/django_ett/etasks/api.py b/django_ett/etasks/api.py index f93a3a5..3cde142 100644 --- a/django_ett/etasks/api.py +++ b/django_ett/etasks/api.py @@ -3,16 +3,16 @@ from tastypie.authentication import ApiKeyAuthentication from tastypie.authorization import Authorization from tastypie.api import Api -from .models import Task, TimeEntry +from .models import Task class EtasksAuthorization(Authorization): def apply_limits(self, request, object_list): - + if request and hasattr(request, 'user'): return object_list.filter(user__pk=request.user.pk) - + return object_list.none() @@ -21,10 +21,10 @@ class TaskResource(ModelResource): class Meta: queryset = Task.objects.all() resource_name = 'task' - + authentication = ApiKeyAuthentication() authorization = EtasksAuthorization() - + v1_api = Api(api_name='1.0') -v1_api.register(TaskResource()) \ No newline at end of file +v1_api.register(TaskResource()) diff --git a/django_ett/etasks/models.py b/django_ett/etasks/models.py index 26d8928..a8c48e4 100644 --- a/django_ett/etasks/models.py +++ b/django_ett/etasks/models.py @@ -15,7 +15,7 @@ class Task(models.Model): user = models.ForeignKey(User, related_name='tasks') name = models.CharField('Task Name', max_length=200, blank=False) created = models.DateTimeField('Created Date/Time', auto_now_add=True) - + def __unicode__(self): if self.name: return self.name @@ -30,25 +30,26 @@ class TimeEntry(models.Model): TYPE_OFF = 1 TYPE_ON = 2 TYPE_STRIKE = 3 - + TYPE_CHOICES = ( (TYPE_OFF, 'Off'), (TYPE_ON, 'On'), (TYPE_STRIKE, 'Strike'), ) - + task = models.ForeignKey(Task, related_name='entries') type = models.IntegerField('Type', choices=TYPE_CHOICES, default=TYPE_OFF) date = models.DateField('Date') segment = models.IntegerField('Segment') - + created = models.DateTimeField('Created Date/Time', auto_now_add=True) updated = models.DateTimeField('Updated Date/Time', auto_now=True) - + def get_segment_time(self): if segment: return self.segment * 15 return 0 - + def __unicode__(self): - return u'%s - %s %s' % (self.task.name, self.date, self.get_segment_time()) \ No newline at end of file + return u'%s - %s %s' % (self.task.name, self.date, + self.get_segment_time()) diff --git a/django_ett/etasks/tests.py b/django_ett/etasks/tests.py index 7dc7d0f..31fccd8 100644 --- a/django_ett/etasks/tests.py +++ b/django_ett/etasks/tests.py @@ -8,13 +8,13 @@ from .models import Task class TaskTest(unittest.TestCase): - def setUp(self): + def setUp(self): self.user, created = User.objects.get_or_create(username='TestUser') self.task = Task.objects.create(user=self.user, name="Test Task 1") - + def testDisplay(self): self.assertEqual(str(self.task), "Test Task 1") def testBadCreation(self): with self.assertRaises(IntegrityError): - Task.objects.create(name='Bad Test') \ No newline at end of file + Task.objects.create(name='Bad Test') diff --git a/django_ett/etasks/urls.py b/django_ett/etasks/urls.py index bff9528..b5eaaa5 100644 --- a/django_ett/etasks/urls.py +++ b/django_ett/etasks/urls.py @@ -6,6 +6,5 @@ from .views import TaskDetailView urlpatterns = patterns('', url(r'^task/(?P.*)/$', TaskDetailView.as_view(), name='task-detail'), - url('^api/', include(v1_api.urls)), ) diff --git a/django_ett/etasks/views.py b/django_ett/etasks/views.py index e48d932..a4c0703 100644 --- a/django_ett/etasks/views.py +++ b/django_ett/etasks/views.py @@ -4,4 +4,4 @@ from .models import Task class TaskDetailView(DetailView): - model = Task \ No newline at end of file + model = Task