Add Linters

.travis.yml

@@ -4,9 +4,12 @@ python:
 # command to install dependencies
 install:
   - "pip install -r dependencies.txt"
+  - "pip install flake8"
   - npm install -g casperjs
   # create the database
   - "cp Lagerregal/template_development.py Lagerregal/settings.py"
   - "./manage.py migrate"
 # command to run tests
-script: "./manage.py test"
+script:
+  - flake8 --config=setup.cfg
+  - "./manage.py test"

Lagerregal/base_settings.py

@@ -1,7 +1,6 @@
 # Django settings for Lagerregal project.
 from __future__ import unicode_literals
 import os
-from django.contrib.messages import constants as messages
 
 
 # Local time zone for this installation. Choices can be found here:
@@ -127,8 +126,8 @@
 )
 
 LANGUAGES = (
-  ('de', 'German'),
-  ('en', 'English'),
+    ('de', 'German'),
+    ('en', 'English'),
 )
 
 AUTH_USER_MODEL = 'users.Lageruser'

Lagerregal/template_development.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from .base_settings import *
 
 DEBUG = True

Lagerregal/template_production.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from .base_settings import *
 
 DEBUG = False

Lagerregal/urls.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf.urls import include, url
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.views import logout
@@ -24,11 +26,12 @@
 # Uncomment the next two lines to enable the admin:
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
-admin.autodiscover()
-import permission; permission.autodiscover()
+import permission
 from permission.decorators import permission_required
 from django.views.decorators.clickjacking import xframe_options_exempt
 
+admin.autodiscover()
+permission.autodiscover()
 
 urlpatterns = [
     url(r'^$', login_required(Home.as_view()), name="home"),

Lagerregal/utils.py

@@ -1,18 +1,11 @@
 from __future__ import unicode_literals
-import csv
-import codecs
+
 import uuid
 from datetime import date, timedelta
 
-import six
 from django.conf import settings
 from django.test.runner import DiscoverRunner
 
-try:
-    import io
-except ImportError:
-    import cStringIO as io
-
 
 class PaginationMixin():
     def get_paginate_by(self, queryset):
@@ -50,15 +43,15 @@ def convert_ad_accountexpires(timestamp):
     if timestamp is None or timestamp == 0:
         return None
     epoch_start = date(year=1601, month=1, day=1)
-    seconds_since_epoch = timestamp/10**7
+    seconds_since_epoch = timestamp / 10 ** 7
     try:
         # ad timestamp can be > than date.max, return None (==never expires)
         new_date = epoch_start + timedelta(seconds=seconds_since_epoch)
         return new_date
     except OverflowError:
         return None
     except Exception:
-        print('Cannot convert expiration_date "{0}", falling back to None'.format(self.expiration_date))
+        print('Cannot convert expiration_date "{0}", falling back to None'.format(timestamp))
 
 
 class DetectableTestRunner(DiscoverRunner):

Lagerregal/wsgi.py

@@ -13,6 +13,8 @@
 framework.
 
 """
+from __future__ import unicode_literals
+
 import os
 import sys
 

api/serializers.py

@@ -1,8 +1,9 @@
+from __future__ import unicode_literals
+
 from rest_framework import serializers
 from django.contrib.auth.models import Group, Permission
 
 from devices.models import Room, Building, Manufacturer, Device, Template, Lending, Picture
-from django.contrib.auth.models import Group
 from devicetypes.models import Type, TypeAttribute
 from users.models import Lageruser, Department
 from network.models import IpAddress

api/tests.py

@@ -4,6 +4,7 @@
 
 Replace this with more appropriate tests for your application.
 """
+from __future__ import unicode_literals
 
 from django.test import TestCase
 

api/views.py

@@ -242,6 +242,7 @@ class DeviceApiPicture(generics.RetrieveDestroyAPIView):
     queryset = Picture.objects.all()
     serializer_class = PictureSerializer
 
+
 class DeviceApiPictureRotate(generics.RetrieveUpdateAPIView):
     model = Picture
     queryset = Picture.objects.all()

devicegroups/models.py

@@ -1,16 +1,21 @@
+from __future__ import unicode_literals
+
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
+
+import six
 from reversion import revisions as reversion
 
 from users.models import Department
 
 
+@six.python_2_unicode_compatible
 class Devicegroup(models.Model):
     name = models.CharField(max_length=200)
     department = models.ForeignKey(Department, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:

devicegroups/tests.py

@@ -1,20 +1,24 @@
+from __future__ import unicode_literals
+
 from django.test.client import Client
 from django.test import TestCase
-from model_mommy import mommy
 from django.core.urlresolvers import reverse
 
+import six
+from model_mommy import mommy
+
 from devicegroups.models import Devicegroup
 from users.models import Lageruser
 
 
 class DevicegroupTests(TestCase):
     def setUp(self):
         self.client = Client()
-        my_admin = Lageruser.objects.create_superuser("test", "[email protected]", "test")
+        Lageruser.objects.create_superuser("test", "[email protected]", "test")
         self.client.login(username='test', password='test')
 
     def test_devicegroup_creation(self):
         devicegroup = mommy.make(Devicegroup)
-        self.assertEqual(devicegroup.__unicode__(), devicegroup.name)
+        self.assertEqual(six.text_type(devicegroup), devicegroup.name)
         self.assertEqual(devicegroup.get_absolute_url(), reverse('devicegroup-detail', kwargs={'pk': devicegroup.pk}))
         self.assertEqual(devicegroup.get_edit_url(), reverse('devicegroup-edit', kwargs={'pk': devicegroup.pk}))

devices/admin.py

@@ -1,7 +1,8 @@
+from __future__ import unicode_literals
+
 from django.contrib import admin
 
 from devices.models import *
-from reversion.models import Version, Revision
 
 
 class DeviceAdmin(admin.ModelAdmin):

devices/ajax.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
+
 import json
 import time
 import csv
@@ -28,7 +29,6 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.utils.dateparse import parse_date
-from django.contrib import messages
 
 from devices.models import Device, Room, Building, Manufacturer, Lending
 from users.models import Lageruser, Department
@@ -251,10 +251,10 @@ def post(self, request):
             return HttpResponse("")
         if invert:
             data = [
-                {"value": "not " + str(object.pk) + "-" + object.__unicode__(), "label": "not " + object.__unicode__()}
+                {"value": "not " + str(object.pk) + "-" + six.text_type(object), "label": "not " + six.text_type(object)}
                 for object in items]
         else:
-            data = [{"value": str(object.pk) + "-" + object.__unicode__(), "label": object.__unicode__()}
+            data = [{"value": str(object.pk) + "-" + six.text_type(object), "label": six.text_type(object)}
                     for object in items]
         return HttpResponse(json.dumps(data), content_type='application/json')
 
@@ -443,7 +443,7 @@ def post(self, request):
                     return render(request, 'devices/searchresult.html', context)
                 except ValueError:
                     context = {
-                        "wrong_id_format" : True
+                        "wrong_id_format": True
                     }
                     return render(request, 'devices/searchempty.html', context)
                 except Device.DoesNotExist:
@@ -547,7 +547,6 @@ def post(self, request):
         conn = httplib.HTTPSConnection(settings.PUPPETDB_SETTINGS['host'],
                                        settings.PUPPETDB_SETTINGS['port'],
                                        context=context)
-        req = settings.PUPPETDB_SETTINGS['req'] + params
         conn.request("GET", settings.PUPPETDB_SETTINGS['req'] + params)
         res = conn.getresponse()
         if res.status != httplib.OK:

devices/context_processors.py

@@ -1,3 +1,5 @@
+from __future__ import unicode_literals
+
 from django.conf import settings  # import the settings file
 
 

devices/forms.py

@@ -1,4 +1,5 @@
 from __future__ import unicode_literals
+
 import re
 
 from django import forms
@@ -66,14 +67,14 @@
 
 def get_department_options():
     try:
-        return DEPARTMENT_OPTIONS+list(Department.objects.all().values_list("id", "name"))
+        return DEPARTMENT_OPTIONS + list(Department.objects.all().values_list("id", "name"))
     except OperationalError:
         return []
 
 
 def get_devicegroup_options():
     try:
-        return [('all', _('All Groups')), ]+list(Devicegroup.objects.all().values_list("id", "name"))
+        return [('all', _('All Groups'))] + list(Devicegroup.objects.all().values_list("id", "name"))
     except OperationalError:
         return []
 
@@ -184,8 +185,8 @@ def __init__(self, pk=None, *args, **kwargs):
         super(LendForm, self).__init__(*args, **kwargs)
         device = None
         try:
-            device = Device.objects.filter(pk = pk)[0]
-        except Exception as e:
+            device = Device.objects.filter(pk=pk)[0]
+        except:
             pass
         if device:
             self.fields['owner'].initial = device.currentlending.owner
@@ -194,8 +195,6 @@ def __init__(self, pk=None, *args, **kwargs):
             self.fields['device'].initial = device
             print(self.fields['device'].initial)
 
-
-
     def clean_device(self):
         device = self.cleaned_data["device"]
         return device

devices/management/commands/ldapimport.py

@@ -29,7 +29,7 @@ def paged_search_ext_s(self, base, scope, filterstr='(objectClass=*)', attrlist=
         # Send first search request
         msgid = self.search_ext(
             *settings.LDAP_USER_SEARCH,
-            serverctrls=(serverctrls or [])+[req_ctrl]
+            serverctrls=(serverctrls or []) + [req_ctrl]
         )
 
         result_pages = 0
@@ -49,7 +49,7 @@ def paged_search_ext_s(self, base, scope, filterstr='(objectClass=*)', attrlist=
                 if pctrls[0].cookie:
                     # Copy cookie from response control to request control
                     req_ctrl.cookie = pctrls[0].cookie
-                    msgid = self.search_ext(*settings.LDAP_USER_SEARCH, serverctrls=(serverctrls or [])+[req_ctrl])
+                    msgid = self.search_ext(*settings.LDAP_USER_SEARCH, serverctrls=(serverctrls or []) + [req_ctrl])
                 else:
                     break
         return result_pages, all_results
@@ -78,7 +78,7 @@ def handle(self, *args, **options):
                 user = Lageruser.objects.get(username=userdata["sAMAccountName"][0])
             except TypeError:
                 continue
-            except Exception as e:
+            except:
                 saveuser = True
                 created = True
                 user = Lageruser(username=userdata["sAMAccountName"][0])
@@ -90,7 +90,7 @@ def handle(self, *args, **options):
                         try:
                             department_name = re.findall(settings.AUTH_LDAP_DEPARTMENT_REGEX, new_value)[-1]
                             new_value = Department.objects.get(name=department_name)
-                        except Department.DoesNotExist as e:
+                        except Department.DoesNotExist:
                             new_value = Department(name=department_name)
                             new_value.save()
                         except IndexError:
@@ -119,7 +119,7 @@ def handle(self, *args, **options):
                         saveuser = True
                         setattr(user, field, new_value)
                         changes[field] = (old_value, new_value)
-                except Exception as e:
+                except:
                     if attr == "accountExpires":
                         continue
                     if attr == "givenName" or attr == "sn":