.git-blame-ignore-revs

@@ -2,5 +2,3 @@
 ce7f2dd5000cf1eb462ae18aeeb5ab66913b452f
 # trivial: apply isort & pyupgrade
 250ef2e74ae674f7039318787ba85b63f2825c7d
-# misc: apply double-quote-string-fixer (#79788)
-103dff03cb7862a6dde22b1a358a7af7f86424fc

.pre-commit-config.yaml

@@ -1,22 +1,18 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
-    hooks:
-    - id: double-quote-string-fixer
 -   repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 20.8b1
     hooks:
     - id: black
       args: ['--target-version', 'py37', '--skip-string-normalization', '--line-length', '110']
 -   repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.7.0
     hooks:
     - id: isort
       args: ['--profile', 'black', '--line-length', '110']
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v2.20.0
     hooks:
     - id: pyupgrade
       args: ['--keep-percent-format', '--py37-plus']

Jenkinsfile

@@ -23,18 +23,10 @@ pipeline {
         stage('Packaging') {
             steps {
                 script {
-                    env.SHORT_JOB_NAME=sh(
-                        returnStdout: true,
-                        // given JOB_NAME=gitea/project/PR-46, returns project
-                        // given JOB_NAME=project/main, returns project
-                        script: '''
-                            echo "${JOB_NAME}" | sed "s/gitea\\///" | awk -F/ '{print $1}'
-                        '''
-                    ).trim()
-                    if (env.GIT_BRANCH == 'main' || env.GIT_BRANCH == 'origin/main') {
-                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye,bookworm ${SHORT_JOB_NAME}"
+                    if (env.JOB_NAME == 'welco' && env.GIT_BRANCH == 'origin/main') {
+                        sh 'sudo -H -u eobuilder /usr/local/bin/eobuilder welco'
                     } else if (env.GIT_BRANCH.startsWith('hotfix/')) {
-                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder -d bullseye,bookworm --branch ${env.GIT_BRANCH} --hotfix ${SHORT_JOB_NAME}"
+                        sh "sudo -H -u eobuilder /usr/local/bin/eobuilder --branch ${env.GIT_BRANCH} --hotfix welco"
                     }
                 }
             }

debian/compat

@@ -0,0 +1 @@
+9

debian/control

@@ -2,13 +2,13 @@ Source: welco
 Maintainer: Frederic Peters <fpters@entrouvert.com>
 Section: python
 Priority: optional
-Build-Depends: python3-setuptools, python3-all, debhelper-compat (= 12), python3-django, dh-python
+Build-Depends: python3-setuptools, python3-all, debhelper (>= 9), python3-django, dh-python, dh-systemd
 Standards-Version: 3.9.6
 
 Package: python3-welco
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends},
-    python3-django (>= 2:2.2),
+    python3-django (>= 1:1.11),
     python3-gadjo,
     python3-requests (>= 2.11),
     python3-django-haystack (>= 2.4.0),
@@ -25,7 +25,6 @@ Depends: ${misc:Depends},
     python3-django-tenant-schemas,
     python3-psycopg2,
     python3-django-mellon,
-    python3-uwsgidecorators,
     python3-xstatic-select2,
     uwsgi,
     uwsgi-plugin-python3,

debian/rules

@@ -5,7 +5,7 @@ export PYBUILD_NAME=welco
 export PYBUILD_DISABLE=test
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3,systemd --buildsystem=pybuild
 
 override_dh_install:
 	dh_install

debian/uwsgi.ini

@@ -9,10 +9,6 @@ http-socket = /run/welco/welco.sock
 chmod-socket = 666
 vacuum = true
 
-spooler-processes = 3
-spooler-python-import = hobo.provisionning.spooler
-spooler-max-tasks = 20
-
 master = true
 processes = 5
 harakiri = 120

debian/welco.cron.d

@@ -1,4 +1,4 @@
 SHELL=/bin/sh
 PATH=/usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin
 
-*/10 6-22 * * * welco /usr/bin/welco-manage tenant_command feed_mail_maarch --all-tenants -v0
+*/10 6-22 * * * welco /usr/bin/welco-manage tenant_command feed_mail_maarch --all-tenants

debian/welco.cron.hourly

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-/sbin/runuser -u welco /usr/bin/welco-manage -- tenant_command clearsessions --all-tenants -v0
+/sbin/runuser -u welco /usr/bin/welco-manage -- tenant_command clearsessions --all-tenants

debian/welco.dirs

@@ -1,6 +1,5 @@
 /etc/welco
 /usr/lib/welco
 /var/lib/welco/collectstatic
-/var/lib/welco/spooler
 /var/lib/welco/tenants
 /var/log/welco

debian/welco.init

@@ -38,7 +38,6 @@ GROUP=$NAME
 DAEMON_ARGS=${DAEMON_ARGS:-"--pidfile=$PIDFILE
 --uid $USER --gid $GROUP
 --ini /etc/$NAME/uwsgi.ini
---spooler /var/lib/$NAME/spooler/
 --daemonize /var/log/uwsgi.$NAME.log"}
 
 # Load the VERBOSE setting and other rcS variables

debian/welco.postinst

@@ -20,7 +20,6 @@ case "$1" in
     # ensure dirs ownership
     chown $USER:$GROUP /var/log/$NAME
     chown $USER:$GROUP /var/lib/$NAME/collectstatic
-    chown $USER:$GROUP /var/lib/$NAME/spooler
     chown $USER:$GROUP /var/lib/$NAME/tenants
     # create a secret file
     SECRET_FILE=$CONFIG_DIR/secret

debian/welco.service

@@ -1,18 +1,16 @@
 [Unit]
 Description=Welco
-After=network.target postgresql.service
+After=network.target syslog.target postgresql.service
 Wants=postgresql.service
 
 [Service]
-SyslogIdentifier=uwsgi/%p
 Environment=WELCO_SETTINGS_FILE=/usr/lib/%p/debian_config.py
 Environment=LANG=C.UTF-8
 User=%p
 Group=%p
 ExecStartPre=/usr/bin/welco-manage migrate_schemas --noinput --verbosity 1
 ExecStartPre=/usr/bin/welco-manage collectstatic --noinput
-ExecStartPre=/bin/mkdir -p /var/lib/welco/spooler/%m/
-ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini --spooler /var/lib/welco/spooler/%m/
+ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini
 ExecReload=/bin/kill -HUP $MAINPID
 KillSignal=SIGQUIT
 TimeoutStartSec=0
@@ -20,6 +18,7 @@ PrivateTmp=true
 Restart=on-failure
 RuntimeDirectory=welco
 Type=notify
+StandardError=syslog
 NotifyAccess=all
 
 [Install]

manage.py

@@ -2,8 +2,8 @@
 import os
 import sys
 
-if __name__ == '__main__':
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'welco.settings')
+if __name__ == "__main__":
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "welco.settings")
 
     from django.core.management import execute_from_command_line
 

setup.py

@@ -106,14 +106,15 @@ setup(
         'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
     ],
     install_requires=[
-        'django>=2.2,<3.3',
+        'django>=1.11,<2.3',
         'gadjo',
         'django-ckeditor<4.5.4',
-        'django-haystack<3.2.2',
-        'django-taggit<3.1.1',
-        'djangorestframework>=3.3,<3.15',
+        'django-haystack<2.8',
+        'django-taggit',
+        'djangorestframework>=3.3,<3.10',
         'requests',
         'whoosh',
         'XStatic-Select2',

tests/test_mail_manager.py

@@ -20,7 +20,7 @@ import httmock
 import requests
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.base import ContentFile
-from django.utils.encoding import force_str
+from django.utils.encoding import force_text
 from webtest import Upload
 
 from welco.sources.mail.models import Mail
@@ -74,11 +74,11 @@ def test_qualification_save_view(settings, app, db):
     def response_get(url, request):
         headers = {'content-type': 'application/json'}
         content = {
-            'err': 0,
-            'data': [
+            "err": 0,
+            "data": [
                 {
-                    'title': 'Foo',
-                    'slug': 'foo',
+                    "title": "Foo",
+                    "slug": "foo",
                 }
             ],
         }
@@ -134,9 +134,9 @@ def test_reject_view(settings, app, user):
 
     @httmock.urlmatch(netloc='maarch.example.net', path='/rest/res/resource/status', method='PUT')
     def response_ok(url, request):
-        assert json.loads(force_str(request.body)) == {'status': 'FOO', 'resId': ['42']}
+        assert json.loads(force_text(request.body)) == {'status': 'FOO', 'resId': ['42']}
         headers = {'content-type': 'application/json'}
-        content = {'maarch_say': 'ok'}
+        content = {"maarch_say": "ok"}
         return httmock.response(200, content, headers)
 
     with httmock.HTTMock(response_ok):

tests/test_source_maarch.py

@@ -18,7 +18,7 @@ import json
 
 import pytest
 from django.contrib.auth.models import User
-from django.utils.encoding import force_str
+from django.utils.encoding import force_text
 from httmock import HTTMock, urlmatch
 
 
@@ -49,7 +49,7 @@ class BaseMock:
 
 class MaarchMock(BaseMock):
     def list_endpoint(self, url, request):
-        self.requests.append(('list_endpoint', url, request, json.loads(force_str(request.body))))
+        self.requests.append(('list_endpoint', url, request, json.loads(force_text(request.body))))
         return {
             'content': json.dumps(self.next_response()),
             'headers': {
@@ -61,13 +61,13 @@ class MaarchMock(BaseMock):
     list_endpoint.path = '^/rest/res/list$'
 
     def update_external_infos(self, url, request):
-        self.requests.append(('update_external_infos', url, request, json.loads(force_str(request.body))))
+        self.requests.append(('update_external_infos', url, request, json.loads(force_text(request.body))))
         return json.dumps({})
 
     update_external_infos.path = '^/rest/res/externalInfos$'
 
     def update_status(self, url, request):
-        self.requests.append(('update_status', url, request, json.loads(force_str(request.body))))
+        self.requests.append(('update_status', url, request, json.loads(force_text(request.body))))
         return {
             'content': json.dumps(self.next_response()),
             'headers': {
@@ -79,7 +79,7 @@ class MaarchMock(BaseMock):
     update_status.path = '^/rest/res/resource/status$'
 
     def post_courrier(self, url, request):
-        self.requests.append(('post_courrier', url, request, json.loads(force_str(request.body))))
+        self.requests.append(('post_courrier', url, request, json.loads(force_text(request.body))))
 
     post_courrier.path = '^/rest/res$'
 
@@ -194,7 +194,7 @@ def test_feed(settings, app, maarch, wcs, user):
                 'resources': [
                     {
                         'res_id': 1,
-                        'fileBase64Content': force_str(base64.b64encode(PDF_MOCK)),
+                        'fileBase64Content': force_text(base64.b64encode(PDF_MOCK)),
                     }
                 ],
             }

tests/test_source_phone.py

@@ -20,7 +20,8 @@ import re
 import pytest
 from django.test import override_settings
 from django.urls import reverse
-from django.utils.encoding import force_str
+from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.timezone import now, timedelta
 
 from welco.sources.phone import models
@@ -227,18 +228,18 @@ def test_phone_zone(user, client):
     client.login(username='toto', password='toto')
     response = client.get(reverse('phone-zone'))
     assert response.status_code == 200
-    assert 'You do not have a phoneline configured' in force_str(response.content)
+    assert 'You do not have a phoneline configured' in force_text(response.content)
 
     models.PhoneLine.take(callee='102', user=user)
 
     response = client.get(reverse('phone-zone'))
     assert response.status_code == 200
-    assert 'You do not have a phoneline configured' not in force_str(response.content)
-    assert '<li>102' in force_str(response.content)
-    assert 'data-callee="102"' in force_str(response.content)
+    assert 'You do not have a phoneline configured' not in force_text(response.content)
+    assert '<li>102' in force_text(response.content)
+    assert 'data-callee="102"' in force_text(response.content)
     currents = re.search(
         '<div id="source-mainarea" ' 'data-current-calls="/api/phone/current-calls/">' '(.*?)</div>',
-        force_str(response.content),
+        force_text(response.content),
         flags=re.DOTALL,
     )
     assert currents.group(1).strip() == ''
@@ -249,7 +250,7 @@ def test_phone_zone(user, client):
     assert response.status_code == 200
     response = client.get(reverse('phone-zone'))
     assert response.status_code == 200
-    assert '<h1>Current Call: <strong>003369999999</strong></h1>' in force_str(response.content)
+    assert '<h1>Current Call: <strong>003369999999</strong></h1>' in force_text(response.content)
 
     # simulate a mellon user
     session = client.session
@@ -257,19 +258,19 @@ def test_phone_zone(user, client):
     session.save()
     response = client.get(reverse('phone-zone'))
     assert response.status_code == 200
-    assert 'agent007' not in force_str(response.content)
-    assert 'data-callee="agent007"' not in force_str(response.content)
-    assert '<li>102' in force_str(response.content)
-    assert 'data-callee="102"' in force_str(response.content)
+    assert 'agent007' not in force_text(response.content)
+    assert 'data-callee="agent007"' not in force_text(response.content)
+    assert '<li>102' in force_text(response.content)
+    assert 'data-callee="102"' in force_text(response.content)
 
     with override_settings(PHONE_AUTOTAKE_MELLON_USERNAME=True):
         response = client.get(reverse('phone-zone'))
         assert response.status_code == 200
-        assert '<h1>Current Call: <strong>003369999999</strong></h1>' in force_str(response.content)
-        assert 'agent007' in force_str(response.content)
-        assert 'data-callee="agent007"' in force_str(response.content)
-        assert '<li>102' in force_str(response.content)
-        assert 'data-callee="102"' in force_str(response.content)
+        assert '<h1>Current Call: <strong>003369999999</strong></h1>' in force_text(response.content)
+        assert 'agent007' in force_text(response.content)
+        assert 'data-callee="agent007"' in force_text(response.content)
+        assert '<li>102' in force_text(response.content)
+        assert 'data-callee="102"' in force_text(response.content)
 
 
 def test_call_expiration(user, client):

tox.ini

@@ -1,7 +1,5 @@
 [tox]
-envlist =
-    py3-django32-drf314
-    py3-django32-black-coverage-pylint-drf312
+envlist = py3-django22-black-coverage-pylint
 toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/welco/{env:BRANCH_NAME:}
 
 [testenv]
@@ -14,7 +12,7 @@ setenv =
   fast: FAST=--nomigrations
   coverage: COVERAGE=--junitxml=junit-{envname}.xml --cov-report xml --cov-report html --cov=welco/
 deps =
-  django32: django>=3.2,<3.3
+  django22: django>=2.2,<2.3
   pytest-cov
   pytest-django
   pytest!=5.3.3
@@ -22,16 +20,13 @@ deps =
   mock<4
   httmock
   python-dateutil
-  pylint<3
-  astroid<3
+  pylint
   pylint-django
   django-webtest
   pyquery
   lxml
   git+https://git.entrouvert.org/debian/django-ckeditor.git
   black: pre-commit
-  drf312: djangorestframework>=3.12,<3.13
-  drf314: djangorestframework>=3.14,<3.15
 commands =
   pylint: ./pylint.sh welco/
   py.test {env:COVERAGE:} {posargs:tests/}

welco/apps.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.apps import apps
-from django.urls import include, re_path
+from django.conf.urls import include, url
 
 
 def register_urls(urlpatterns):
@@ -25,9 +25,9 @@ def register_urls(urlpatterns):
         if hasattr(app, 'get_before_urls'):
             urls = app.get_before_urls()
             if urls:
-                pre_urls.append(re_path('^', include(urls)))
+                pre_urls.append(url('^', include(urls)))
         if hasattr(app, 'get_after_urls'):
             urls = app.get_after_urls()
             if urls:
-                post_urls.append(re_path('^', include(urls)))
+                post_urls.append(url('^', include(urls)))
     return pre_urls + urlpatterns + post_urls

welco/contacts/forms.py

@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.utils.translation import gettext_lazy as _
 from django.utils.translation import pgettext_lazy
+from django.utils.translation import ugettext_lazy as _
 
 DEFAULT_TITLE_CHOICES = (
     ('', ''),

welco/forms.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from django import forms
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from .utils import get_wcs_options
 

welco/kb/models.py

@@ -17,7 +17,7 @@
 from ckeditor.fields import RichTextField
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from taggit.managers import TaggableManager
 
 

welco/monkeypatch.py

@@ -18,7 +18,7 @@ import ckeditor.widgets
 from django.forms.utils import flatatt
 from django.template.loader import render_to_string
 from django.urls import reverse
-from django.utils.encoding import force_str
+from django.utils.encoding import force_text
 from django.utils.html import conditional_escape
 from django.utils.safestring import mark_safe
 from django.utils.translation import get_language
@@ -41,7 +41,7 @@ def ckeditor_render(self, name, value, attrs=None, renderer=None):
 
     # Force to text to evaluate possible lazy objects
     external_plugin_resources = [
-        [force_str(a), force_str(b), force_str(c)] for a, b, c in self.external_plugin_resources
+        [force_text(a), force_text(b), force_text(c)] for a, b, c in self.external_plugin_resources
     ]
 
     return mark_safe(
@@ -49,7 +49,7 @@ def ckeditor_render(self, name, value, attrs=None, renderer=None):
             'ckeditor/widget.html',
             {
                 'final_attrs': flatatt(final_attrs),
-                'value': conditional_escape(force_str(value)),
+                'value': conditional_escape(force_text(value)),
                 'id': final_attrs['id'],
                 'config': ckeditor.widgets.json_encode(self.config),
                 'external_plugin_resources': ckeditor.widgets.json_encode(external_plugin_resources),

welco/qualif/models.py

@@ -18,7 +18,7 @@ from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from welco.utils import get_wcs_formdef_details, get_wcs_services, push_wcs_formdata
 

welco/settings.py

@@ -11,7 +11,7 @@ https://docs.djangoproject.com/en/1.7/ref/settings/
 import os
 
 from django.conf import global_settings
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))

welco/sources/counter/models.py

@@ -16,7 +16,7 @@
 
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from welco.qualif.models import Association
 

welco/sources/counter/urls.py

@@ -14,10 +14,10 @@
 # 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/>.
 
-from django.urls import path
+from django.conf.urls import url
 
 from . import views
 
 urlpatterns = [
-    path('ajax/counter/zone/', views.zone, name='counter-zone'),
+    url(r'^ajax/counter/zone/$', views.zone, name='counter-zone'),
 ]

welco/sources/mail/forms.py

@@ -16,7 +16,7 @@
 
 from django import forms
 from django.conf import settings
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 
 class MailQualificationForm(forms.Form):

welco/sources/mail/maarch.py

@@ -15,10 +15,11 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import base64
-import urllib.parse
 
 import requests
 from dateutil.parser import parse as parse_datetime
+from django.utils import six
+from django.utils.six.moves.urllib import parse as urlparse
 from requests.adapters import HTTPAdapter
 from requests.packages.urllib3.util.retry import Retry
 
@@ -151,19 +152,19 @@ class MaarchCourrier:
 
     @property
     def list_url(self):
-        return urllib.parse.urljoin(self.url, 'rest/res/list')
+        return urlparse.urljoin(self.url, 'rest/res/list')
 
     @property
     def update_external_infos_url(self):
-        return urllib.parse.urljoin(self.url, 'rest/res/externalInfos')
+        return urlparse.urljoin(self.url, 'rest/res/externalInfos')
 
     @property
     def update_status_url(self):
-        return urllib.parse.urljoin(self.url, 'rest/res/resource/status')
+        return urlparse.urljoin(self.url, 'rest/res/resource/status')
 
     @property
     def post_courrier_url(self):
-        return urllib.parse.urljoin(self.url, 'rest/res')
+        return urlparse.urljoin(self.url, 'rest/res')
 
     def get_courriers(self, clause, fields=None, limit=None, include_file=False, order_by=None):
         if fields:

welco/sources/mail/management/commands/feed_mail.py

@@ -17,7 +17,7 @@
 import os
 from optparse import make_option
 
-from django.core.files.base import ContentFile
+from django.core.files import File
 from django.core.management.base import BaseCommand, CommandError
 
 from ...models import Mail
@@ -35,7 +35,7 @@ class Command(BaseCommand):
                 continue
             if not open(filepath).read(5) == '%PDF-':
                 continue
-            mail = Mail(content=ContentFile(open(filepath).read(), name=os.path.basename(filepath)))
+            mail = Mail(content=File(open(filepath)))
             mail.scanner_category = kwargs.get('category')
             mail.save()
             count += 1

welco/sources/mail/models.py

@@ -25,7 +25,7 @@ from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from welco.qualif.models import Association
 from welco.utils import get_wcs_data

welco/sources/mail/urls.py

@@ -14,17 +14,17 @@
 # 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/>.
 
-from django.urls import path, re_path
+from django.conf.urls import url
 
 from .views import edit_note, feeder, mail_count, mail_response, note, qualification_save, reject, viewer
 
 urlpatterns = [
-    path('mail/viewer/', viewer, name='mail-viewer'),
-    path('mail/feeder/', feeder, name='mail-feeder'),
-    path('ajax/mail/reject', reject, name='mail-reject'),
-    path('ajax/qualification-mail-save', qualification_save, name='qualif-mail-save'),
-    path('ajax/mail/edit-note/', edit_note, name='mail-edit-note'),
-    re_path(r'^ajax/mail/note/(?P<pk>\w+)$', note, name='mail-note'),
-    path('ajax/count/mail/', mail_count, name='mail-count'),
-    path('api/mail/response/', mail_response, name='mail-api-response'),
+    url('viewer/$', viewer, name='mail-viewer'),
+    url('mail/feeder/$', feeder, name='mail-feeder'),
+    url(r'^ajax/mail/reject$', reject, name='mail-reject'),
+    url(r'^ajax/qualification-mail-save$', qualification_save, name='qualif-mail-save'),
+    url(r'^ajax/mail/edit-note/$', edit_note, name='mail-edit-note'),
+    url(r'^ajax/mail/note/(?P<pk>\w+)$', note, name='mail-note'),
+    url(r'^ajax/count/mail/$', mail_count, name='mail-count'),
+    url(r'^api/mail/response/$', mail_response, name='mail-api-response'),
 ]

welco/sources/mail/utils.py

@@ -49,7 +49,7 @@ class WelcoMaarchCourrier(MaarchCourrier):
         )
 
     def get_mail(self, mail_id):
-        return self.get_courriers(clause='res_id=%s' % mail_id)[0]
+        return self.get_courriers(clause="res_id=%s" % mail_id)[0]
 
     def set_grc_received_status(self, mails):
         self.update_status(mails, self.grc_received_status)

welco/sources/mail/views.py

@@ -25,7 +25,7 @@ from django.db.transaction import atomic
 from django.http import HttpResponse, HttpResponseRedirect
 from django.template import RequestContext
 from django.urls import reverse
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 from rest_framework import authentication, permissions, serializers, status

welco/sources/phone/models.py

@@ -21,7 +21,7 @@ from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
 from django.urls import reverse
 from django.utils.timezone import now, timedelta
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 
 from welco.qualif.models import Association
 

welco/sources/phone/urls.py

@@ -14,15 +14,15 @@
 # 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/>.
 
-from django.urls import path, re_path
+from django.conf.urls import url
 
 from . import views
 
 urlpatterns = [
-    path('ajax/phone/zone/', views.zone, name='phone-zone'),
-    path('api/phone/call-event/', views.call_event, name='phone-call-event'),
-    re_path(r'^api/phone/active-call/(?P<pk>\w+)/$', views.active_call, name='phone-active-call'),
-    path('api/phone/current-calls/', views.current_calls, name='phone-current-calls'),
-    path('api/phone/take-line/', views.take_line, name='phone-take-line'),
-    path('api/phone/release-line/', views.release_line, name='phone-release-line'),
+    url(r'^ajax/phone/zone/$', views.zone, name='phone-zone'),
+    url(r'^api/phone/call-event/$', views.call_event, name='phone-call-event'),
+    url(r'^api/phone/active-call/(?P<pk>\w+)/$', views.active_call, name='phone-active-call'),
+    url(r'^api/phone/current-calls/$', views.current_calls, name='phone-current-calls'),
+    url(r'^api/phone/take-line/$', views.take_line, name='phone-take-line'),
+    url(r'^api/phone/release-line/$', views.release_line, name='phone-release-line'),
 ]

welco/sources/phone/views.py

@@ -23,7 +23,8 @@ from django.contrib.auth.decorators import login_required
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.template import RequestContext
-from django.utils.encoding import force_str
+from django.utils import six
+from django.utils.encoding import force_text
 from django.utils.timezone import now
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
@@ -84,7 +85,7 @@ def call_event(request):
     """
     logger = logging.getLogger(__name__)
     try:
-        payload = json.loads(force_str(request.body))
+        payload = json.loads(force_text(request.body))
         assert isinstance(payload, dict), 'payload is not a JSON object'
         assert set(payload.keys()) <= {
             'event',
@@ -102,7 +103,7 @@ def call_event(request):
             assert isinstance(payload['data'], dict), 'data must be a JSON object'
     except (TypeError, ValueError, AssertionError) as e:
         return HttpResponseBadRequest(
-            json.dumps({'err': 1, 'msg': force_str(e)}), content_type='application/json'
+            json.dumps({'err': 1, 'msg': force_text(e)}), content_type='application/json'
         )
     # janitoring: stop active calls to the callee
     if settings.PHONE_ONE_CALL_PER_CALLEE:
@@ -202,12 +203,12 @@ def take_line(request):
     """
     logger = logging.getLogger(__name__)
     try:
-        payload = json.loads(force_str(request.body))
+        payload = json.loads(force_text(request.body))
         assert isinstance(payload, dict), 'payload is not a JSON object'
         assert list(payload.keys()) == ['callee'], 'payload must have only one key: callee'
     except (TypeError, ValueError, AssertionError) as e:
         return HttpResponseBadRequest(
-            json.dumps({'err': 1, 'msg': force_str(e)}), content_type='application/json'
+            json.dumps({'err': 1, 'msg': force_text(e)}), content_type='application/json'
         )
     PhoneLine.take(payload['callee'], request.user)
     logger.info('user %s took line %s', request.user, payload['callee'])
@@ -223,12 +224,12 @@ def release_line(request):
     """
     logger = logging.getLogger(__name__)
     try:
-        payload = json.loads(force_str(request.body))
+        payload = json.loads(force_text(request.body))
         assert isinstance(payload, dict), 'payload is not a JSON object'
         assert list(payload.keys()) == ['callee'], 'payload must have only one key: callee'
     except (TypeError, ValueError, AssertionError) as e:
         return HttpResponseBadRequest(
-            json.dumps({'err': 1, 'msg': force_str(e)}), content_type='application/json'
+            json.dumps({'err': 1, 'msg': force_text(e)}), content_type='application/json'
         )
     PhoneLine.release(payload['callee'], request.user)
     logger.info('user %s released line %s', request.user, payload['callee'])

welco/urls.py

@@ -16,10 +16,10 @@
 
 from ckeditor import views as ckeditor_views
 from django.conf import settings
+from django.conf.urls import include, url
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from django.urls import include, path, re_path
 from django.views.decorators.cache import never_cache
 
 import welco.contacts.views
@@ -30,53 +30,53 @@ from . import apps
 from .kb.views import kb_manager_required
 
 urlpatterns = [
-    path('', welco.views.home, name='home'),
-    path('mail/', welco.views.home_mail, name='home-mail'),
-    path('phone/', welco.views.home_phone, name='home-phone'),
-    path('counter/', welco.views.home_counter, name='home-counter'),
-    re_path(r'^', include('welco.sources.phone.urls')),
-    re_path(r'^', include('welco.sources.counter.urls')),
-    path('ajax/qualification', welco.views.qualification, name='qualif-zone'),
-    re_path(
+    url(r'^$', welco.views.home, name='home'),
+    url(r'^mail/$', welco.views.home_mail, name='home-mail'),
+    url(r'^phone/$', welco.views.home_phone, name='home-phone'),
+    url(r'^counter/$', welco.views.home_counter, name='home-counter'),
+    url(r'^', include('welco.sources.phone.urls')),
+    url(r'^', include('welco.sources.counter.urls')),
+    url(r'^ajax/qualification$', welco.views.qualification, name='qualif-zone'),
+    url(
         r'^ajax/remove-association/(?P<pk>\w+)$',
         welco.views.remove_association,
         name='ajax-remove-association',
     ),
-    re_path(r'^ajax/create-formdata/(?P<pk>\w+)$', welco.views.create_formdata, name='ajax-create-formdata'),
-    path('ajax/kb', welco.kb.views.zone, name='kb-zone'),
-    path('kb/', welco.kb.views.page_list, name='kb-home'),
-    path('kb/add/', welco.kb.views.page_add, name='kb-page-add'),
-    path('kb/search/', welco.kb.views.page_search, name='kb-page-search'),
-    path('kb/search/json/', welco.kb.views.page_search_json, name='kb-page-search-json'),
-    re_path(r'^kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail, name='kb-page-view'),
-    re_path(r'^ajax/kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail_fragment, name='kb-page-fragment'),
-    re_path(r'^kb/(?P<slug>[\w-]+)/edit$', welco.kb.views.page_edit, name='kb-page-edit'),
-    re_path(r'^kb/(?P<slug>[\w-]+)/delete$', welco.kb.views.page_delete, name='kb-page-delete'),
-    path('ajax/contacts', welco.contacts.views.zone, name='contacts-zone'),
-    path('contacts/search/json/', welco.contacts.views.search_json, name='contacts-search-json'),
-    re_path(
+    url(r'^ajax/create-formdata/(?P<pk>\w+)$', welco.views.create_formdata, name='ajax-create-formdata'),
+    url(r'^ajax/kb$', welco.kb.views.zone, name='kb-zone'),
+    url(r'^kb/$', welco.kb.views.page_list, name='kb-home'),
+    url(r'^kb/add/$', welco.kb.views.page_add, name='kb-page-add'),
+    url(r'^kb/search/$', welco.kb.views.page_search, name='kb-page-search'),
+    url(r'^kb/search/json/$', welco.kb.views.page_search_json, name='kb-page-search-json'),
+    url(r'^kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail, name='kb-page-view'),
+    url(r'^ajax/kb/(?P<slug>[\w-]+)/$', welco.kb.views.page_detail_fragment, name='kb-page-fragment'),
+    url(r'^kb/(?P<slug>[\w-]+)/edit$', welco.kb.views.page_edit, name='kb-page-edit'),
+    url(r'^kb/(?P<slug>[\w-]+)/delete$', welco.kb.views.page_delete, name='kb-page-delete'),
+    url(r'^ajax/contacts$', welco.contacts.views.zone, name='contacts-zone'),
+    url(r'^contacts/search/json/$', welco.contacts.views.search_json, name='contacts-search-json'),
+    url(
         r'^ajax/contacts/(?P<slug>[\w-]+)/$',
         welco.contacts.views.contact_detail_fragment,
         name='contact-page-fragment',
     ),
-    path('contacts/add/', welco.contacts.views.contact_add, name='contacts-add'),
-    re_path(
+    url(r'^contacts/add/$', welco.contacts.views.contact_add, name='contacts-add'),
+    url(
         r'^ajax/summary/(?P<source_type>\w+)/(?P<source_pk>\w+)/$',
         welco.views.wcs_summary,
         name='wcs-summary',
     ),
-    re_path(r'^admin/', admin.site.urls),
-    path('logout/', welco.views.logout, name='auth_logout'),
-    path('login/', welco.views.login, name='auth_login'),
-    re_path(r'^menu.json$', welco.views.menu_json, name='menu_json'),
-    re_path(r'^ckeditor/upload/', kb_manager_required(ckeditor_views.upload), name='ckeditor_upload'),
-    re_path(
+    url(r'^admin/', admin.site.urls),
+    url(r'^logout/$', welco.views.logout, name='auth_logout'),
+    url(r'^login/$', welco.views.login, name='auth_login'),
+    url(r'^menu.json$', welco.views.menu_json, name='menu_json'),
+    url(r'^ckeditor/upload/', kb_manager_required(ckeditor_views.upload), name='ckeditor_upload'),
+    url(
         r'^ckeditor/browse/', never_cache(kb_manager_required(ckeditor_views.browse)), name='ckeditor_browse'
     ),
 ]
 
 if 'mellon' in settings.INSTALLED_APPS:
-    urlpatterns.append(re_path(r'^accounts/mellon/', include('mellon.urls')))
+    urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls')))
 
 # static and media files
 urlpatterns += staticfiles_urlpatterns()

welco/utils.py

@@ -21,7 +21,6 @@ import hmac
 import json
 import random
 import re
-import urllib.parse
 
 import requests
 from django.conf import settings
@@ -29,12 +28,13 @@ from django.core.cache import cache
 from django.http import HttpResponse, HttpResponseBadRequest
 from django.utils.encoding import smart_bytes
 from django.utils.http import quote, urlencode
+from django.utils.six.moves.urllib import parse as urlparse
 
 
 def sign_url(url, key, algo='sha256', timestamp=None, nonce=None):
-    parsed = urllib.parse.urlparse(url)
+    parsed = urlparse.urlparse(url)
     new_query = sign_query(parsed.query, key, algo, timestamp, nonce)
-    return urllib.parse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
+    return urlparse.urlunparse(parsed[:4] + (new_query,) + parsed[5:])
 
 
 def sign_query(query, key, algo='sha256', timestamp=None, nonce=None):

welco/views.py

@@ -27,9 +27,9 @@ from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import resolve_url
 from django.template import RequestContext
 from django.urls import reverse
-from django.utils.encoding import force_str
+from django.utils.encoding import force_text
 from django.utils.http import quote
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import TemplateView
 
@@ -222,7 +222,7 @@ def menu_json(request):
         if user_groups.intersection(channel_groups):
             menu.append(
                 {
-                    'label': force_str(labels.get(channel)),
+                    'label': force_text(labels.get(channel)),
                     'slug': channel,
                     'url': request.build_absolute_uri(reverse('home-%s' % channel)),
                 }
@@ -230,7 +230,7 @@ def menu_json(request):
     if check_kb_user_perms(request.user, access=True):
         menu.append(
             {
-                'label': force_str(_('Knowledge Base')),
+                'label': force_text(_('Knowledge Base')),
                 'slug': 'book',
                 'url': request.build_absolute_uri(reverse('kb-home')),
             }

welco/wsgi.py

@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.7/howto/deployment/wsgi/
 
 import os
 
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'welco.settings')
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "welco.settings")
 
 from django.core.wsgi import get_wsgi_application