0003-misc-fix-unused-import-pylint-error-56288.patch

Lauréline Guérin, 30 août 2021 17:53

Voir les différences: en ligne côte à côte

Subject: [PATCH 03/31] misc: fix unused-import pylint error (#56288)

 combo/apps/assets/templatetags/assets.py         |  1 -
 combo/apps/assets/views.py                       |  1 -
 combo/apps/dashboard/views.py                    |  2 --
 combo/apps/dataviz/forms.py                      |  1 -
 combo/apps/dataviz/models.py                     |  1 -
 combo/apps/family/migrations/0001_initial.py     |  1 -
 combo/apps/family/utils.py                       |  1 -
 combo/apps/gallery/forms.py                      |  1 -
 combo/apps/gallery/models.py                     |  2 --
 combo/apps/gallery/views.py                      | 13 ++-----------
 combo/apps/kb/models.py                          |  2 --
 combo/apps/lingo/manager_views.py                |  1 -
 .../lingo/migrations/0017_auto_20160327_0831.py  |  2 +-
 .../lingo/migrations/0043_auto_20210628_1849.py  |  2 +-
 combo/apps/lingo/models.py                       |  2 +-
 combo/apps/lingo/views.py                        |  2 +-
 combo/apps/maps/models.py                        |  1 -
 combo/apps/pwa/__init__.py                       |  2 +-
 combo/apps/pwa/models.py                         |  2 --
 combo/apps/pwa/views.py                          |  2 +-
 .../0004_remove_searchcell__search_service.py    |  2 +-
 .../migrations/0008_wcsformcell_cached_json.py   |  2 +-
 .../0009_remove_wcscategorycell_link_page.py     |  2 +-
 combo/data/management/commands/cron.py           |  1 -
 combo/data/migrations/0005_auto_20150226_0903.py |  2 +-
 .../data/migrations/0019_create_parent_cells.py  |  2 +-
 combo/data/migrations/0031_remove_blurps.py      |  2 +-
 combo/data/migrations/0040_auto_20200119_1017.py |  2 +-
 combo/data/models.py                             |  4 ++--
 combo/data/utils.py                              |  1 -
 combo/manager/apps.py                            |  2 +-
 combo/manager/urls.py                            |  2 +-
 combo/public/templatetags/combo.py               |  3 +--
 combo/public/views.py                            |  2 --
 combo/utils/crypto.py                            |  1 -
 combo/utils/signature.py                         |  1 -
 tests/conftest.py                                | 10 ++++++++++
 tests/test_calendar.py                           |  2 +-
 tests/test_dashboard.py                          |  4 +---
 tests/test_dataviz.py                            |  9 +++------
 tests/test_fargo.py                              |  1 -
 tests/test_gallery_cell.py                       |  2 +-
 tests/test_import_export.py                      |  1 -
 tests/test_lingo_payment.py                      |  1 -
 tests/test_notification.py                       |  4 ++--
 tests/test_public.py                             | 16 ++--------------
 tests/test_publik.py                             | 12 +-----------
 tests/test_pwa.py                                |  2 --
 tests/test_utils.py                              |  1 -
 49 files changed, 41 insertions(+), 97 deletions(-)

combo/apps/assets/templatetags/assets.py
18	18
19	19	from django import template
20	20	from django.db.models.fields.files import ImageFieldFile
21		from django.utils import six
22	21	from sorl.thumbnail.shortcuts import get_thumbnail
23	22
24	23	from ..models import Asset

combo/apps/assets/views.py
14	14	# You should have received a copy of the GNU Affero General Public License
15	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16
17		import json
18	17	import os
19	18	import tarfile
20	19

     import json
     from django.conf import settings
     from django.contrib.contenttypes.models import ContentType
     from django.core.exceptions import PermissionDenied
     from django.db.models import Max, Min
     from django.http import (
-...
     from django.views.decorators.csrf import csrf_exempt
     from django.views.generic import View
     from combo.data.library import get_cell_class
     from combo.data.models import CellBase, ConfigJsonCell
     from combo.public.views import render_cell

combo/apps/dataviz/forms.py
14	14	# You should have received a copy of the GNU Affero General Public License
15	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16
17		import sys
18	17	from collections import OrderedDict
19	18
20	19	from django import forms

combo/apps/dataviz/models.py
16	16
17	17	import copy
18	18	import os
19		import sys
20	19	from collections import OrderedDict
21	20	from datetime import date, datetime, timedelta
22	21

combo/apps/family/migrations/0001_initial.py
1		import ckeditor.fields
2	1	from django.db import migrations, models
3	2
4	3

combo/apps/family/utils.py
15	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16
17	17	from django.conf import settings
18		from django.utils.http import urlencode
19	18
20	19	from combo.utils import requests
21	20

combo/apps/gallery/forms.py
15	15	# along with this program. If not, see <http://www.gnu.org/licenses/>.
16	16
17	17	from django import forms
18		from django.utils.translation import ugettext_lazy as _
19	18
20	19	from .models import Image
21	20

     import json
     from django import template
     from django.core import serializers
     from django.db import models
     from django.forms import models as model_forms
     from django.utils.translation import ugettext_lazy as _
     from combo.data.library import register_cell_class

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     from django.shortcuts import redirect
     from django.urls import reverse, reverse_lazy
     from django.views.generic import (
         CreateView,
         DeleteView,
         DetailView,
         FormView,
         ListView,
         RedirectView,
         TemplateView,
         UpdateView,
+    )
     from django.urls import reverse
     from django.views.generic import CreateView, UpdateView
     from .forms import ImageAddForm, ImageEditForm
     from .models import GalleryCell, Image

     # You should have received a copy of the GNU Affero General Public License
     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import datetime
     import itertools
     from django.db import models
     from django.utils import timezone
     from django.utils.translation import ugettext_lazy as _
     from combo.data.library import register_cell_class

combo/apps/lingo/manager_views.py
26	26	from django.shortcuts import get_object_or_404
27	27	from django.template.response import TemplateResponse
28	28	from django.urls import reverse, reverse_lazy
29		from django.utils import six
30	29	from django.utils.timezone import make_aware, now
31	30	from django.utils.translation import ugettext_lazy as _
32	31	from django.views.generic import CreateView, DeleteView, ListView, UpdateView, View

combo/apps/lingo/migrations/0017_auto_20160327_0831.py
1	1	import ckeditor.fields
2		from django.db import migrations, models
	2	from django.db import migrations
3	3
4	4
5	5	class Migration(migrations.Migration):

combo/apps/lingo/migrations/0043_auto_20210628_1849.py
1	1	# Generated by Django 2.2.19 on 2021-06-28 16:49
2	2
3		from django.db import migrations, models
	3	from django.db import migrations
4	4
5	5
6	6	class Migration(migrations.Migration):

     from django.forms import models as model_forms
     from django.template.loader import render_to_string
     from django.urls import reverse
     from django.utils import dateparse, six, timezone
     from django.utils import dateparse, timezone
     from django.utils.encoding import force_bytes, python_2_unicode_compatible
     from django.utils.formats import localize
     from django.utils.six.moves.urllib import parse as urlparse

     from django.shortcuts import get_object_or_404
     from django.template.response import TemplateResponse
     from django.urls import reverse
     from django.utils import dateparse, six, timezone
     from django.utils import dateparse
     from django.utils.encoding import force_text, smart_text
     from django.utils.http import urlencode
     from django.utils.translation import ugettext_lazy as _

combo/apps/maps/models.py
22	22	from django.core import serializers, validators
23	23	from django.db import models
24	24	from django.urls import reverse
25		from django.utils import six
26	25	from django.utils.encoding import python_2_unicode_compatible
27	26	from django.utils.html import escape
28	27	from django.utils.text import slugify

         name = 'combo.apps.pwa'
         def ready(self):
             from . import signals
             from . import signals  # noqa pylint: disable=unused-import
         def get_before_urls(self):
             from . import urls

     from django.core.files.base import ContentFile
     from django.core.files.storage import default_storage
     from django.db import models
     from django.utils import six
     from django.utils.encoding import force_bytes, force_text
     from django.utils.six import BytesIO
     from django.utils.translation import ugettext_lazy as _
     from py_vapid import Vapid

     from django.conf import settings
     from django.http import Http404, HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, JsonResponse
     from django.template.loader import TemplateDoesNotExist, get_template
     from django.utils.encoding import force_bytes, force_text
     from django.utils.encoding import force_text
     from django.views.decorators.csrf import csrf_exempt
     from django.views.generic import TemplateView
     from py_vapid import Vapid

combo/apps/search/migrations/0004_remove_searchcell__search_service.py
1		from django.db import migrations, models
	1	from django.db import migrations
2	2
3	3
4	4	class Migration(migrations.Migration):

combo/apps/wcs/migrations/0008_wcsformcell_cached_json.py
1	1	from django.contrib.postgres.fields import JSONField
2		from django.db import migrations, models
	2	from django.db import migrations
3	3
4	4
5	5	class Migration(migrations.Migration):

combo/apps/wcs/migrations/0009_remove_wcscategorycell_link_page.py
1		from django.db import migrations, models
	1	from django.db import migrations
2	2
3	3
4	4	class Migration(migrations.Migration):

combo/data/management/commands/cron.py
19	19	import traceback
20	20
21	21	from django.apps import apps
22		from django.conf import settings
23	22	from django.core.management.base import BaseCommand, CommandError
24	23
25	24

combo/data/migrations/0005_auto_20150226_0903.py
1	1	import ckeditor.fields
2		from django.db import migrations, models
	2	from django.db import migrations
3	3
4	4
5	5	class Migration(migrations.Migration):

combo/data/migrations/0019_create_parent_cells.py
1	1	from django.conf import settings
2		from django.db import migrations, models
	2	from django.db import migrations
3	3
4	4
5	5	def create_parent_content_cells(apps, schema_editor):

combo/data/migrations/0031_remove_blurps.py
1		from django.db import migrations, models
	1	from django.db import migrations
2	2
3	3
4	4	class Migration(migrations.Migration):

combo/data/migrations/0040_auto_20200119_1017.py
1	1	# Generated by Django 1.11.17 on 2020-01-19 09:17
2	2
3		from django.db import migrations, models
	3	from django.db import migrations
4	4
5	5
6	6	class Migration(migrations.Migration):

     from django.dispatch import receiver
     from django.forms import models as model_forms
     from django.forms.widgets import MediaDefiningClass
     from django.template import Context, TemplateDoesNotExist, TemplateSyntaxError, engines
     from django.template import TemplateDoesNotExist, TemplateSyntaxError, engines
     from django.test.client import RequestFactory
     from django.utils import six, timezone
     from django.utils import timezone
     from django.utils.encoding import force_text, python_2_unicode_compatible, smart_bytes
     from django.utils.html import strip_tags
     from django.utils.safestring import mark_safe

combo/data/utils.py
21	21	from django.contrib.auth.models import Group
22	22	from django.core.serializers.base import DeserializationError
23	23	from django.db import transaction
24		from django.utils import six
25	24	from django.utils.encoding import python_2_unicode_compatible
26	25	from django.utils.translation import ugettext_lazy as _
27	26

combo/manager/apps.py
21	21	name = 'combo.manager'
22	22
23	23	def ready(self):
24		import combo.monkeypatch
	24	import combo.monkeypatch # noqa pylint: disable=unused-import

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import ckeditor.views as ckeditor_views
     from django.conf.urls import include, url
     from django.conf.urls import url
     from django.contrib.admin.views.decorators import staff_member_required
     from django.views.decorators.cache import never_cache

     import datetime
     import json
     import math
     import time
     from decimal import Decimal
     from decimal import DivisionByZero as DecimalDivisionByZero
     from decimal import InvalidOperation as DecimalInvalidOperation
-...
     from django.template import Template, TemplateSyntaxError, defaultfilters
     from django.template.defaultfilters import stringfilter
     from django.utils import dateparse, six
     from django.utils import dateparse
     from django.utils.encoding import force_text
     from django.utils.html import format_html
     from django.utils.safestring import mark_safe

     import re
     from itertools import chain
     import django
     from django.conf import settings
     from django.contrib import messages
     from django.contrib.auth import logout as auth_logout
-...
     from combo import utils
     from combo.apps.assets.models import Asset
     from combo.apps.search.models import SearchCell
     from combo.data.models import (
         CellBase,
         Page,

combo/utils/crypto.py
19	19	from Cryptodome import Random
20	20	from Cryptodome.Cipher import AES
21	21	from Cryptodome.Protocol.KDF import PBKDF2
22		from django.utils import six
23	22	from django.utils.encoding import force_text
24	23
25	24

combo/utils/signature.py
21	21	import random
22	22
23	23	from django.conf import settings
24		from django.utils import six
25	24	from django.utils.encoding import smart_bytes
26	25	from django.utils.http import quote, urlencode
27	26	from django.utils.six.moves.urllib import parse as urlparse

         return user
     @pytest.fixture
     def normal_user():
         try:
             user = User.objects.get(username='normal-user')
             user.groups = []
         except User.DoesNotExist:
             user = User.objects.create_user(username='normal-user', email='', password='normal-user')
         return user
     @pytest.fixture
     def nocache(settings):
         settings.CACHES = {

     from django.utils.six.moves.urllib import parse as urlparse
     from combo.apps.calendar.models import BookingCalendar
     from combo.apps.calendar.utils import get_calendar, get_chrono_events, get_chrono_service
     from combo.apps.calendar.utils import get_calendar, get_chrono_service
     from combo.data.models import Page
     pytestmark = pytest.mark.django_db

     from django.apps import apps
     from django.conf import settings
     from django.contrib.auth.models import User
     from django.core.management import call_command
     from django.test import override_settings
     from django.urls import reverse
     from django.utils.six.moves.urllib import parse as urlparse
     from combo.apps.dashboard.models import DashboardCell, Tile
     from combo.data.models import CellBase, ConfigJsonCell, Page, TextCell
     from combo.wsgi import application
     from combo.data.models import Page, TextCell
     pytestmark = pytest.mark.django_db

     import json
     import urllib.parse
     from datetime import date, timedelta
     from datetime import date
     from unittest import mock
     import pytest
     from django.apps import apps
     from django.contrib.auth.models import Group, User
     from django.db import connection
     from django.db.migrations.executor import MigrationExecutor
     from django.contrib.auth.models import Group
     from django.test import override_settings
     from django.utils import timezone
     from httmock import HTTMock, remember_called, urlmatch, with_httmock
     from requests.exceptions import HTTPError
     from combo.apps.dataviz.models import ChartNgCell, Gauge, Statistic, UnsupportedDataSet
     from combo.data.models import Page, ValidityInfo
     from .test_public import login, normal_user
     from .test_public import login
     pytestmark = pytest.mark.django_db

tests/test_fargo.py
1		import json
2	1	import re
3	2	from unittest import mock
4	3

     import pytest
     from django.urls import reverse
     from combo.apps.gallery.models import GalleryCell, Image
     from combo.apps.gallery.models import GalleryCell
     from combo.data.models import Page
     from .test_manager import login

tests/test_import_export.py
1	1	import base64
2		import datetime
3	2	import json
4	3	import os
5	4	import shutil

tests/test_lingo_payment.py
12	12	from django.conf import settings
13	13	from django.contrib.auth.models import User
14	14	from django.core.management import CommandError, call_command
15		from django.db import transaction
16	15	from django.http.request import QueryDict
17	16	from django.test import override_settings
18	17	from django.urls import reverse

     import json
     from datetime import timedelta as timedelta
     from datetime import timedelta
     from decimal import Decimal
     from unittest import mock
-...
     from django.test.client import RequestFactory
     from django.urls import reverse
     from django.utils.encoding import force_text
     from django.utils.timezone import now, timedelta
     from django.utils.timezone import now
     from combo.apps.lingo.models import ActiveItems, PaymentBackend, Regie
     from combo.apps.notifications.models import Notification, NotificationsCell

     import pytest
     from django.conf import settings
     from django.contrib.auth.models import Group, User
     from django.contrib.auth.models import Group
     from django.core.files import File
     from django.db import connection
     from django.test import override_settings
-...
     from django.utils.six.moves.urllib import parse as urlparse
     try:
         import mellon
         import mellon  # pylint: disable=unused-import
     except ImportError:
         mellon = None
     import requests
-...
     from combo.apps.assets.models import Asset
     from combo.apps.family.models import FamilyInfosCell
     from combo.data.models import (
         CellBase,
         ConfigJsonCell,
         FeedCell,
         JsonCell,
-...
         Redirect,
         TextCell,
+    )
     from combo.wsgi import application
     pytestmark = pytest.mark.django_db
     from .test_manager import login
     @pytest.fixture
     def normal_user():
         try:
             user = User.objects.get(username='normal-user')
             user.groups = []
         except User.DoesNotExist:
             user = User.objects.create_user(username='normal-user', email='', password='normal-user')
         return user
     def test_missing_index(app):
         Page.objects.all().delete()
         resp = app.get('/', status=200)

     import pytest
     from django.conf import settings
     from django.contrib.auth.models import Group, User
     from django.contrib.auth.models import Group
     from combo.data.models import Page
-...
         test_manager.login(app, username='normal-user', password='normal-user')
     @pytest.fixture
     def normal_user():
         try:
             user = User.objects.get(username='normal-user')
             user.groups = []
         except User.DoesNotExist:
             user = User.objects.create_user(username='normal-user', email='', password='normal-user')
         return user
     class KnownServices:
         def __init__(self, known_services):
             self.known_services = known_services

     import base64
     import os
     from unittest import mock
     import pytest
     import pywebpush
     from django.conf import settings
     from django.core.files import File
     from django.template import Context, Template

tests/test_utils.py
1	1	import pytest
2	2	from django.conf import settings
3		from django.contrib.auth.models import AnonymousUser
4	3	from django.template import Context, RequestContext
5	4	from django.test import override_settings
6	5	from django.test.client import RequestFactory
7		-

Projet

Général

Profil

Produits Entr'ouvert » Combo

0003-misc-fix-unused-import-pylint-error-56288.patch