From 4c1b933cb3d03ff755c45b97983ea364d9588dfa Mon Sep 17 00:00:00 2001 From: Josue Kouka Date: Thu, 1 Dec 2016 18:31:57 +0100 Subject: [PATCH 1/3] misc: fix pep8 errors --- passerelle/base/models.py | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/passerelle/base/models.py b/passerelle/base/models.py index b5d4c18..cf3911a 100644 --- a/passerelle/base/models.py +++ b/passerelle/base/models.py @@ -1,7 +1,7 @@ import logging from django.conf import settings -from django.core.exceptions import ValidationError, ObjectDoesNotExist +from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.db import models from django.db.models import Q @@ -14,27 +14,27 @@ from django.contrib.contenttypes import fields from model_utils.managers import InheritanceManager as ModelUtilsInheritanceManager import passerelle -import requests KEYTYPE_CHOICES = ( ('API', 'API Key'), ('SIGN', 'Signature HMAC'), ) + class ApiUser(models.Model): username = models.CharField(max_length=128, - verbose_name=_('Username')) + verbose_name=_('Username')) fullname = models.CharField(max_length=50, - verbose_name=_('Full Name')) + verbose_name=_('Full Name')) description = models.TextField(blank=True, - verbose_name=_('Description')) + verbose_name=_('Description')) keytype = models.CharField(max_length=4, choices=KEYTYPE_CHOICES, - blank=True, verbose_name=_('Key Type')) + blank=True, verbose_name=_('Key Type')) key = models.CharField(max_length=256, blank=True, verbose_name=_('Key')) ipsource = models.GenericIPAddressField(blank=True, null=True, unpack_ipv4=True, - verbose_name=_('IP Address')) + verbose_name=_('IP Address')) def __unicode__(self): return u'%s <%s>' % (self.fullname, self.username) @@ -78,14 +78,11 @@ class BaseResource(models.Model): users = models.ManyToManyField(ApiUser, blank=True) log_level = models.CharField( _('Log Level'), max_length=10, - choices = ( - ('NOTSET','NOTSET'), - ('DEBUG','DEBUG'), - ('INFO','INFO'), - ('WARNING','WARNING'), - ('ERROR','ERROR'), - ('CRITICAL','CRITICAL'), - ('FATAL','FATAL'), + choices=( + ('NOTSET', 'NOTSET'), ('DEBUG', 'DEBUG'), + ('INFO', 'INFO'), ('WARNING', 'WARNING'), + ('ERROR', 'ERROR'), ('CRITICAL', 'CRITICAL'), + ('FATAL', 'FATAL'), ), default='NOTSET' ) @@ -112,7 +109,7 @@ class BaseResource(models.Model): if request.user.is_superuser: return True restricted = self.users.all() - return not restricted or request.apiuser in restricted + return not restricted or request.apiuser in restricted @classmethod def is_enabled(cls): @@ -136,7 +133,7 @@ class BaseResource(models.Model): def get_absolute_url(self): return reverse('view-connector', - kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) + kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) @classmethod def get_add_url(cls): @@ -144,11 +141,11 @@ class BaseResource(models.Model): def get_edit_url(self): return reverse('edit-connector', - kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) + kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) def get_delete_url(self): return reverse('delete-connector', - kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) + kwargs={'connector': self.get_connector_slug(), 'slug': self.slug}) def get_description_fields(self): return [(x, getattr(self, x.name, None)) for x in self._meta.fields if x.name not in ( @@ -168,5 +165,4 @@ class AccessRight(models.Model): ) def __unicode__(self): - return '%s (on %s <%s>) (for %s)' % (self.codename, - self.resource_type, self.resource_pk, self.apiuser) + return '%s (on %s <%s>) (for %s)' % (self.codename, self.resource_type, self.resource_pk, self.apiuser) -- 2.11.0