From eb5ea772de90344e02586f584644d81882f97f49 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Wed, 1 Mar 2023 15:00:56 +0100 Subject: [PATCH] misc: apply pre-commit-hooks (#74980) --- debian/control | 8 ++- passerelle_montpellier_sig/forms.py | 4 +- .../migrations/0001_initial.py | 5 +- .../0002_montpelliersig_log_level.py | 3 - .../migrations/0003_auto_20170921_1213.py | 3 - .../0004_remove_montpelliersig_log_level.py | 2 - passerelle_montpellier_sig/models.py | 3 +- .../passerelle_montpellier_sig/base.html | 8 +-- .../montpelliersig_confirm_delete.html | 16 ++--- .../montpelliersig_detail.html | 58 +++++++++---------- .../montpelliersig_form.html | 42 +++++++------- passerelle_montpellier_sig/urls.py | 20 +++---- passerelle_montpellier_sig/views.py | 14 ++--- setup.py | 8 +-- tests/test_main.py | 4 +- 15 files changed, 92 insertions(+), 106 deletions(-) diff --git a/debian/control b/debian/control index 3e623f3..359373d 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,13 @@ Source: passerelle-montpellier-sig Maintainer: Serghei Mihai Section: python Priority: optional -Build-Depends: dh-python, debhelper-compat (= 12), python3-setuptools, python3-all +Build-Depends: debhelper-compat (= 12), + dh-python, + python3-all, + python3-setuptools, Standards-Version: 3.9.1 Package: python3-passerelle-montpellier-sig Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, python3-pyproj, python3-requests +Depends: python3-pyproj, python3-requests, ${misc:Depends}, ${python3:Depends} Description: Passerelle extension for Montpellier's GIS (Python 3) - diff --git a/passerelle_montpellier_sig/forms.py b/passerelle_montpellier_sig/forms.py index 5a6ca18..976dd7d 100644 --- a/passerelle_montpellier_sig/forms.py +++ b/passerelle_montpellier_sig/forms.py @@ -1,5 +1,5 @@ -from django.utils.text import slugify from django import forms +from django.utils.text import slugify from .models import MontpellierSig @@ -12,4 +12,4 @@ class MontpellierSigForm(forms.ModelForm): def save(self, commit=True): if not self.instance.slug: self.instance.slug = slugify(self.instance.title) - return super(MontpellierSigForm, self).save(commit=commit) + return super().save(commit=commit) diff --git a/passerelle_montpellier_sig/migrations/0001_initial.py b/passerelle_montpellier_sig/migrations/0001_initial.py index 5bb9767..45bac78 100644 --- a/passerelle_montpellier_sig/migrations/0001_initial.py +++ b/passerelle_montpellier_sig/migrations/0001_initial.py @@ -1,7 +1,4 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/passerelle_montpellier_sig/migrations/0002_montpelliersig_log_level.py b/passerelle_montpellier_sig/migrations/0002_montpelliersig_log_level.py index d41452b..3939373 100644 --- a/passerelle_montpellier_sig/migrations/0002_montpelliersig_log_level.py +++ b/passerelle_montpellier_sig/migrations/0002_montpelliersig_log_level.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/passerelle_montpellier_sig/migrations/0003_auto_20170921_1213.py b/passerelle_montpellier_sig/migrations/0003_auto_20170921_1213.py index 0f2d68e..305f9d3 100644 --- a/passerelle_montpellier_sig/migrations/0003_auto_20170921_1213.py +++ b/passerelle_montpellier_sig/migrations/0003_auto_20170921_1213.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/passerelle_montpellier_sig/migrations/0004_remove_montpelliersig_log_level.py b/passerelle_montpellier_sig/migrations/0004_remove_montpelliersig_log_level.py index 9939487..a61e61f 100644 --- a/passerelle_montpellier_sig/migrations/0004_remove_montpelliersig_log_level.py +++ b/passerelle_montpellier_sig/migrations/0004_remove_montpelliersig_log_level.py @@ -1,6 +1,4 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-11-19 13:51 -from __future__ import unicode_literals from django.db import migrations diff --git a/passerelle_montpellier_sig/models.py b/passerelle_montpellier_sig/models.py index 796c935..4de8e94 100644 --- a/passerelle_montpellier_sig/models.py +++ b/passerelle_montpellier_sig/models.py @@ -1,9 +1,8 @@ -import requests import logging +import requests from django.db import models from django.utils.translation import ugettext_lazy as _ - from passerelle.base.models import BaseResource from passerelle.utils.jsonresponse import APIError diff --git a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/base.html b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/base.html index 7573aa2..ee154c8 100644 --- a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/base.html +++ b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/base.html @@ -1,8 +1,8 @@ {% extends "passerelle/manage.html" %} {% block more-user-links %} -{{ block.super }} -{% if object.id %} -{{ object.title }} -{% endif %} + {{ block.super }} + {% if object.id %} + {{ object.title }} + {% endif %} {% endblock %} diff --git a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_confirm_delete.html b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_confirm_delete.html index ea10314..b4e07da 100644 --- a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_confirm_delete.html +++ b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_confirm_delete.html @@ -2,15 +2,15 @@ {% load i18n %} {% block appbar %} -

Montpellier SIG - {{ object.title }}

+

Montpellier SIG - {{ object.title }}

{% endblock %} {% block content %} -
- {% csrf_token %} -
- - {% trans 'Cancel' %} -
-
+
+ {% csrf_token %} +
+ + {% trans 'Cancel' %} +
+
{% endblock %} diff --git a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_detail.html b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_detail.html index 2636a1d..a96164c 100644 --- a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_detail.html +++ b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_detail.html @@ -2,33 +2,33 @@ {% load i18n passerelle %} {% block endpoints %} - + {% endblock %} diff --git a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_form.html b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_form.html index af42091..15417a5 100644 --- a/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_form.html +++ b/passerelle_montpellier_sig/templates/passerelle_montpellier_sig/montpelliersig_form.html @@ -3,33 +3,33 @@ {% load url from future %} {% block more-user-links %} -{{ block.super }} -{% if not object.id %} -{% trans 'Add Montpellier SIG Connector' %} -{% endif %} + {{ block.super }} + {% if not object.id %} + {% trans 'Add Montpellier SIG Connector' %} + {% endif %} {% endblock %} {% block appbar %} -

SIG - {% if object.id %}{{ object.title }}{% else %}{% trans 'New' %}{% endif %}

+

SIG - {% if object.id %}{{ object.title }}{% else %}{% trans 'New' %}{% endif %}

{% endblock %} {% block content %} -
-
- {% csrf_token %} - {{ form.as_p }} -
- {% block buttons %} -
- - {% if object.id %} - {% trans 'Cancel' %} - {% else %} - {% trans 'Cancel' %} - {% endif %} -
- {% endblock %} -
+
+
+ {% csrf_token %} + {{ form.as_p }} +
+ {% block buttons %} +
+ + {% if object.id %} + {% trans 'Cancel' %} + {% else %} + {% trans 'Cancel' %} + {% endif %} +
+ {% endblock %} +
{% endblock %} diff --git a/passerelle_montpellier_sig/urls.py b/passerelle_montpellier_sig/urls.py index 102516e..6f4377b 100644 --- a/passerelle_montpellier_sig/urls.py +++ b/passerelle_montpellier_sig/urls.py @@ -1,29 +1,27 @@ -from django.conf.urls import include, url from django.contrib.auth.decorators import login_required - -from passerelle.urls_utils import decorated_includes, required, app_enabled +from django.urls import re_path +from passerelle.urls_utils import app_enabled, decorated_includes, required from .views import * - urlpatterns = [ - url(r'^(?P[\w,-]+)/communes$', CommunesView.as_view(), name='montpellier-sig-communes'), - url(r'^(?P[\w,-]+)/voies/(?P\d+)$', VoiesView.as_view(), name='montpellier-sig-voies'), - url( + re_path(r'^(?P[\w,-]+)/communes$', CommunesView.as_view(), name='montpellier-sig-communes'), + re_path(r'^(?P[\w,-]+)/voies/(?P\d+)$', VoiesView.as_view(), name='montpellier-sig-voies'), + re_path( r'^(?P[\w,-]+)/voies/(?P\d+)/(?P[\w ]+)/numero$', VoiesCommuneView.as_view(), name='montpellier-voies-commune', ), - url( + re_path( r'^(?P[\w,-]+)/voiecommune/(?P[\w ]+)$', VoieCommuneView.as_view(), name='montpellier-sig-voiecommune', ), - url(r'^(?P[\w,-]+)/reverse$', AdresseView.as_view(), name='montpellier-sig-adresse'), - url( + re_path(r'^(?P[\w,-]+)/reverse$', AdresseView.as_view(), name='montpellier-sig-adresse'), + re_path( r'^(?P[\w,-]+)/quartier/(?P\d+)/(?P[\w ]+)/(?P\d+)\w*/$', DistrictView.as_view(), name='montpellier-sig-district', ), - url(r'^(?P[\w,-]+)/viewer/$', ViewerUrlView.as_view(), name='montpellier-sig-viewer'), + re_path(r'^(?P[\w,-]+)/viewer/$', ViewerUrlView.as_view(), name='montpellier-sig-viewer'), ] diff --git a/passerelle_montpellier_sig/views.py b/passerelle_montpellier_sig/views.py index 3a78016..c07aaeb 100644 --- a/passerelle_montpellier_sig/views.py +++ b/passerelle_montpellier_sig/views.py @@ -1,19 +1,17 @@ -import requests import unicodedata -import pyproj -from django.views.generic.detail import SingleObjectMixin, DetailView -from django.views.generic.edit import CreateView, UpdateView, DeleteView -from django.views.generic.base import View, RedirectView +import pyproj +import requests from django.http import HttpResponseBadRequest from django.shortcuts import redirect - from django.utils.encoding import force_text - +from django.views.generic.base import RedirectView, View +from django.views.generic.detail import DetailView, SingleObjectMixin +from django.views.generic.edit import CreateView, DeleteView, UpdateView from passerelle import utils -from .models import MontpellierSig from .forms import MontpellierSigForm +from .models import MontpellierSig prefix_map = { 'ALL': 'ALLEE', diff --git a/setup.py b/setup.py index f77b27e..6e687b0 100644 --- a/setup.py +++ b/setup.py @@ -3,12 +3,12 @@ import os import subprocess import sys +from distutils.cmd import Command +from distutils.command.build import build as _build +from setuptools import find_packages, setup from setuptools.command.install_lib import install_lib as _install_lib from setuptools.command.sdist import sdist -from distutils.command.build import build as _build -from distutils.cmd import Command -from setuptools import setup, find_packages class eo_sdist(sdist): @@ -29,7 +29,7 @@ def get_version(): tag exists, take 0.0- and add the length of the commit log. """ if os.path.exists('VERSION'): - version_file = open('VERSION', 'r') + version_file = open('VERSION') version = version_file.read() version_file.close() return version diff --git a/tests/test_main.py b/tests/test_main.py index 36469bd..484b294 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -1,12 +1,12 @@ import json -import httmock +import httmock from django.test import TestCase from django.test.client import Client +from passerelle.utils.jsonresponse import APIError from passerelle_montpellier_sig.models import MontpellierSig from passerelle_montpellier_sig.views import prefix_cleanup, split_street -from passerelle.utils.jsonresponse import APIError class PrefixCleanupTestCase(TestCase):