From 7ec3a763d6893a377b71cf7e3a18e138251b46e8 Mon Sep 17 00:00:00 2001 From: Juan Ignacio Fiorentino Date: Thu, 22 Mar 2018 17:36:20 -0300 Subject: [PATCH] PEP8 models. --- oidc_provider/models.py | 36 +++++++++++++++++++++++------------- tox.ini | 2 +- 2 files changed, 24 insertions(+), 14 deletions(-) diff --git a/oidc_provider/models.py b/oidc_provider/models.py index 9f78c0d..00287c1 100644 --- a/oidc_provider/models.py +++ b/oidc_provider/models.py @@ -33,17 +33,20 @@ JWT_ALGS = [ class Client(models.Model): name = models.CharField(max_length=100, default='', verbose_name=_(u'Name')) - owner = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_(u'Owner'), blank = True, null = True, default = None, on_delete=models.SET_NULL, related_name='oidc_clients_set') + owner = models.ForeignKey( + settings.AUTH_USER_MODEL, verbose_name=_(u'Owner'), blank=True, + null=True, default=None, on_delete=models.SET_NULL, related_name='oidc_clients_set') client_type = models.CharField( max_length=30, choices=CLIENT_TYPE_CHOICES, default='confidential', verbose_name=_(u'Client Type'), - help_text=_(u'Confidential clients are capable of maintaining the confidentiality of their credentials. ' - u'Public clients are incapable.')) + help_text=_(u'Confidential clients are capable of maintaining the confidentiality' + u' of their credentials. Public clients are incapable.')) client_id = models.CharField(max_length=255, unique=True, verbose_name=_(u'Client ID')) client_secret = models.CharField(max_length=255, blank=True, verbose_name=_(u'Client SECRET')) - response_type = models.CharField(max_length=30, choices=RESPONSE_TYPE_CHOICES, verbose_name=_(u'Response Type')) + response_type = models.CharField( + max_length=30, choices=RESPONSE_TYPE_CHOICES, verbose_name=_(u'Response Type')) jwt_alg = models.CharField( max_length=10, choices=JWT_ALGS, @@ -51,27 +54,31 @@ class Client(models.Model): verbose_name=_(u'JWT Algorithm'), help_text=_(u'Algorithm used to encode ID Tokens.')) date_created = models.DateField(auto_now_add=True, verbose_name=_(u'Date Created')) - website_url = models.CharField(max_length=255, blank=True, default='', verbose_name=_(u'Website URL')) + website_url = models.CharField( + max_length=255, blank=True, default='', verbose_name=_(u'Website URL')) terms_url = models.CharField( max_length=255, blank=True, default='', verbose_name=_(u'Terms URL'), help_text=_(u'External reference to the privacy policy of the client.')) - contact_email = models.CharField(max_length=255, blank=True, default='', verbose_name=_(u'Contact Email')) - logo = models.FileField(blank=True, default='', upload_to='oidc_provider/clients', verbose_name=_(u'Logo Image')) + contact_email = models.CharField( + max_length=255, blank=True, default='', verbose_name=_(u'Contact Email')) + logo = models.FileField( + blank=True, default='', upload_to='oidc_provider/clients', verbose_name=_(u'Logo Image')) reuse_consent = models.BooleanField( default=True, verbose_name=_('Reuse Consent?'), - help_text=_('If enabled, the Server will save the user consent given to a specific client, so that' - ' user won\'t be prompted for the same authorization multiple times.')) + help_text=_('If enabled, server will save the user consent given to a specific client, ' + 'so that user won\'t be prompted for the same authorization multiple times.')) require_consent = models.BooleanField( default=True, verbose_name=_('Require Consent?'), help_text=_('If disabled, the Server will NEVER ask the user for consent.')) _redirect_uris = models.TextField( - default='', verbose_name=_(u'Redirect URIs'), help_text=_(u'Enter each URI on a new line.')) + default='', verbose_name=_(u'Redirect URIs'), + help_text=_(u'Enter each URI on a new line.')) @property def redirect_uris(self): @@ -112,7 +119,8 @@ class Client(models.Model): class BaseCodeTokenModel(models.Model): - user = models.ForeignKey(settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) + user = models.ForeignKey( + settings.AUTH_USER_MODEL, verbose_name=_(u'User'), on_delete=models.CASCADE) client = models.ForeignKey(Client, verbose_name=_(u'Client'), on_delete=models.CASCADE) expires_at = models.DateTimeField(verbose_name=_(u'Expiration Date')) _scope = models.TextField(default='', verbose_name=_(u'Scopes')) @@ -144,7 +152,8 @@ class Code(BaseCodeTokenModel): nonce = models.CharField(max_length=255, blank=True, default='', verbose_name=_(u'Nonce')) is_authentication = models.BooleanField(default=False, verbose_name=_(u'Is Authentication?')) code_challenge = models.CharField(max_length=255, null=True, verbose_name=_(u'Code Challenge')) - code_challenge_method = models.CharField(max_length=255, null=True, verbose_name=_(u'Code Challenge Method')) + code_challenge_method = models.CharField( + max_length=255, null=True, verbose_name=_(u'Code Challenge Method')) class Meta: verbose_name = _(u'Authorization Code') @@ -192,7 +201,8 @@ class UserConsent(BaseCodeTokenModel): class RSAKey(models.Model): - key = models.TextField(verbose_name=_(u'Key'), help_text=_(u'Paste your private RSA Key here.')) + key = models.TextField( + verbose_name=_(u'Key'), help_text=_(u'Paste your private RSA Key here.')) class Meta: verbose_name = _(u'RSA Key') diff --git a/tox.ini b/tox.ini index f0d7fc4..db00837 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ commands = [pytest] DJANGO_SETTINGS_MODULE = oidc_provider.tests.settings python_files = test_*.py -flake8-max-line-length = 99 +flake8-max-line-length = 100 flake8-ignore = .git ALL __pycache__ ALL