From 0d57f0a2925add7e0458c7e898ded52001f38b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 11 Jan 2021 18:52:39 +0100 Subject: [PATCH] trivial: apply black --- .../migrations/0001_initial.py | 17 ++++- .../migrations/0002_auto_20190418_1118.py | 4 +- .../migrations/0003_auto_20190919_1211.py | 12 +++- ...glcartadscs_cerfa_pdf_url_substitutions.py | 6 +- grandlyon_cartads_cs/models.py | 68 ++++++++++--------- setup.py | 24 +++---- 6 files changed, 81 insertions(+), 50 deletions(-) diff --git a/grandlyon_cartads_cs/migrations/0001_initial.py b/grandlyon_cartads_cs/migrations/0001_initial.py index e17998a..f828e66 100644 --- a/grandlyon_cartads_cs/migrations/0001_initial.py +++ b/grandlyon_cartads_cs/migrations/0001_initial.py @@ -17,11 +17,19 @@ class Migration(migrations.Migration): migrations.CreateModel( name='GLCartaDSCS', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ( + 'id', + models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), + ), ('title', models.CharField(max_length=50, verbose_name='Title')), ('description', models.TextField(verbose_name='Description')), ('slug', models.SlugField(unique=True, verbose_name='Identifier')), - ('wsdl_base_url', models.URLField(help_text='ex: https://example.net/adscs/webservices/', verbose_name='WSDL Base URL')), + ( + 'wsdl_base_url', + models.URLField( + help_text='ex: https://example.net/adscs/webservices/', verbose_name='WSDL Base URL' + ), + ), ('username', models.CharField(max_length=64, verbose_name='Username')), ('password', models.CharField(max_length=64, verbose_name='Password')), ('iv', models.CharField(max_length=16, verbose_name='Initialisation Vector')), @@ -32,7 +40,10 @@ class Migration(migrations.Migration): ('ftp_client_name', models.CharField(max_length=64, verbose_name='FTP Client Name')), ('token_url', models.URLField(max_length=256, verbose_name='Token URL')), ('token_authorization', models.CharField(max_length=128, verbose_name='Token Authorization')), - ('verify_cert', models.BooleanField(default=True, verbose_name='Check HTTPS Certificate validity')), + ( + 'verify_cert', + models.BooleanField(default=True, verbose_name='Check HTTPS Certificate validity'), + ), ('users', models.ManyToManyField(blank=True, to='base.ApiUser')), ], options={ diff --git a/grandlyon_cartads_cs/migrations/0002_auto_20190418_1118.py b/grandlyon_cartads_cs/migrations/0002_auto_20190418_1118.py index 9de0772..4490402 100644 --- a/grandlyon_cartads_cs/migrations/0002_auto_20190418_1118.py +++ b/grandlyon_cartads_cs/migrations/0002_auto_20190418_1118.py @@ -15,7 +15,9 @@ class Migration(migrations.Migration): migrations.AddField( model_name='glcartadscs', name='sendfile_ws_dirname', - field=models.CharField(blank=True, max_length=256, verbose_name='Sendfile Webservice Directory Name'), + field=models.CharField( + blank=True, max_length=256, verbose_name='Sendfile Webservice Directory Name' + ), ), migrations.AddField( model_name='glcartadscs', diff --git a/grandlyon_cartads_cs/migrations/0003_auto_20190919_1211.py b/grandlyon_cartads_cs/migrations/0003_auto_20190919_1211.py index abaabfe..61fcfdc 100644 --- a/grandlyon_cartads_cs/migrations/0003_auto_20190919_1211.py +++ b/grandlyon_cartads_cs/migrations/0003_auto_20190919_1211.py @@ -15,11 +15,19 @@ class Migration(migrations.Migration): migrations.AddField( model_name='glcartadscs', name='client_name', - field=models.CharField(blank=True, help_text='Only useful in shared environments.', max_length=64, null=True, verbose_name='Client Name'), + field=models.CharField( + blank=True, + help_text='Only useful in shared environments.', + max_length=64, + null=True, + verbose_name='Client Name', + ), ), migrations.AlterField( model_name='glcartadscs', name='users', - field=models.ManyToManyField(blank=True, related_name='_glcartadscs_users_+', related_query_name='+', to='base.ApiUser'), + field=models.ManyToManyField( + blank=True, related_name='_glcartadscs_users_+', related_query_name='+', to='base.ApiUser' + ), ), ] diff --git a/grandlyon_cartads_cs/migrations/0004_glcartadscs_cerfa_pdf_url_substitutions.py b/grandlyon_cartads_cs/migrations/0004_glcartadscs_cerfa_pdf_url_substitutions.py index a19d63d..7131965 100644 --- a/grandlyon_cartads_cs/migrations/0004_glcartadscs_cerfa_pdf_url_substitutions.py +++ b/grandlyon_cartads_cs/migrations/0004_glcartadscs_cerfa_pdf_url_substitutions.py @@ -15,6 +15,10 @@ class Migration(migrations.Migration): migrations.AddField( model_name='glcartadscs', name='cerfa_pdf_url_substitutions', - field=models.TextField(blank=True, help_text='On each line, published URL prefix;actual URL prefix', verbose_name='URL substitutions for CERFA downloads'), + field=models.TextField( + blank=True, + help_text='On each line, published URL prefix;actual URL prefix', + verbose_name='URL substitutions for CERFA downloads', + ), ), ] diff --git a/grandlyon_cartads_cs/models.py b/grandlyon_cartads_cs/models.py index 9764008..e9c4a9d 100644 --- a/grandlyon_cartads_cs/models.py +++ b/grandlyon_cartads_cs/models.py @@ -28,6 +28,7 @@ from passerelle.apps.cartads_cs.models import AbstractCartaDSCS, CartaDSDossier from passerelle.utils import SOAPTransport from passerelle.utils.http_authenticators import HttpBearerAuth + class Transport(SOAPTransport): def post(self, address, message, headers): headers['Authorization'] = self.resource.get_api_manager_token() @@ -45,18 +46,16 @@ class GLCartaDSCS(AbstractCartaDSCS): token_url = models.URLField(_('Token URL'), max_length=256) token_authorization = models.CharField(_('Token Authorization'), max_length=128) - sendfile_ws_url = models.URLField( - _('Sendfile Webservice URL'), - max_length=256, blank=True) + sendfile_ws_url = models.URLField(_('Sendfile Webservice URL'), max_length=256, blank=True) sendfile_ws_dirname = models.CharField( - _('Sendfile Webservice Directory Name'), - max_length=256, blank=True) - verify_cert = models.BooleanField(default=True, - verbose_name=_('Check HTTPS Certificate validity')) + _('Sendfile Webservice Directory Name'), max_length=256, blank=True + ) + verify_cert = models.BooleanField(default=True, verbose_name=_('Check HTTPS Certificate validity')) cerfa_pdf_url_substitutions = models.TextField( - _('URL substitutions for CERFA downloads'), - help_text=_('On each line, published URL prefix;actual URL prefix'), - blank=True) + _('URL substitutions for CERFA downloads'), + help_text=_('On each line, published URL prefix;actual URL prefix'), + blank=True, + ) class Meta: verbose_name = 'Cart@DS CS (@ Grand Lyon)' @@ -84,10 +83,11 @@ class GLCartaDSCS(AbstractCartaDSCS): return token headers = {'Authorization': 'Basic %s' % self.token_authorization} resp = self.requests.post( - self.token_url, - headers=headers, - data={'grant_type': 'client_credentials'}, - verify=self.verify_cert).json() + self.token_url, + headers=headers, + data={'grant_type': 'client_credentials'}, + verify=self.verify_cert, + ).json() token = '%s %s' % (resp.get('token_type'), resp.get('access_token')) timeout = int(resp.get('expires_in')) cache.set(cache_key, token, timeout) @@ -103,26 +103,28 @@ class GLCartaDSCS(AbstractCartaDSCS): # -- https://bz.apache.org/bugzilla/show_bug.cgi?id=39243 # and that's why there's a seemingly unnecessary GET request first. api_manager_token = self.get_api_manager_token() - response = self.requests.get(self.sendfile_ws_url, - headers={'Authorization': api_manager_token}) + response = self.requests.get(self.sendfile_ws_url, headers={'Authorization': api_manager_token}) if response.status_code == 401: api_manager_token = self.get_api_manager_token(renew=True) b64_zip = base64.b64encode(open(zip_filename, 'rb').read()) # call with start=true to initialize file - resp = self.requests.post(self.sendfile_ws_url, - data={ - 'fileName': self.sendfile_ws_dirname + os.path.basename(zip_filename), - 'start': 'true', - }) + resp = self.requests.post( + self.sendfile_ws_url, + data={ + 'fileName': self.sendfile_ws_dirname + os.path.basename(zip_filename), + 'start': 'true', + }, + ) chunk_size = 16777216 # 16MB for n in range(0, len(b64_zip), chunk_size): - resp = self.requests.post(self.sendfile_ws_url, - data={ - 'fileName': self.sendfile_ws_dirname + os.path.basename(zip_filename), - 'b64_fileContent': b64_zip[n:n+chunk_size].decode('ascii'), - }, - headers={'Authorization': api_manager_token} - ) + resp = self.requests.post( + self.sendfile_ws_url, + data={ + 'fileName': self.sendfile_ws_dirname + os.path.basename(zip_filename), + 'b64_fileContent': b64_zip[n : n + chunk_size].decode('ascii'), + }, + headers={'Authorization': api_manager_token}, + ) resp.raise_for_status() if resp.content: # error messages are put in content, valid responses are empty. @@ -132,10 +134,13 @@ class GLCartaDSCS(AbstractCartaDSCS): client = self.soap_client(wsdl_url=self.get_wsdl_url('ServiceRechercheDossier')) client2 = self.soap_client(wsdl_url=self.get_wsdl_url('ServiceDossier')) - resp = client.service.GetDossiersSelonDerniereEtape( + resp = ( + client.service.GetDossiersSelonDerniereEtape( self.client_name, datetime.datetime.now() - datetime.timedelta(days=1), - datetime.datetime.now()), + datetime.datetime.now(), + ), + ) if resp and resp[0] is not None: for cartads_dossier in resp[0]: resp = client2.service.GetInfosDossier(self.get_token(), cartads_dossier['IdDossier']) @@ -152,7 +157,8 @@ class GLCartaDSCS(AbstractCartaDSCS): zip_ack_response__in=('True', '0'), cartads_id_dossier__isnull=True, tracking_code=tracking_code, - id=dossier_id) + id=dossier_id, + ) except CartaDSDossier.DoesNotExist: continue dossier.cartads_id_dossier = resp['IdDossier'] diff --git a/setup.py b/setup.py index 5f69205..b96abda 100644 --- a/setup.py +++ b/setup.py @@ -24,9 +24,9 @@ class eo_sdist(sdist): def get_version(): - '''Use the VERSION, if absent generates a version with git describe, if not - tag exists, take 0.0- and add the length of the commit log. - ''' + """Use the VERSION, if absent generates a version with git describe, if not + tag exists, take 0.0- and add the length of the commit log. + """ if os.path.exists('VERSION'): with open('VERSION', 'r') as v: return v.read() @@ -51,12 +51,12 @@ def get_version(): setup( - name='passerelle-grandlyon-cartads-cs', - version=get_version(), - author="Entr'ouvert", - author_email="info@entrouvert.com", - packages=find_packages(), - cmdclass={ - 'sdist': eo_sdist, - } - ) + name='passerelle-grandlyon-cartads-cs', + version=get_version(), + author="Entr'ouvert", + author_email="info@entrouvert.com", + packages=find_packages(), + cmdclass={ + 'sdist': eo_sdist, + }, +)