0001-python3-use-django.utils.six-url-parsing-functions-3.patch

Paul Marillonnet, 06 mars 2019 17:17

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

Subject: [PATCH] python3: use django.utils.six url-parsing functions (#31139)

 src/authentic2/cors.py                          | 2 +-
 src/authentic2/disco_service/disco_responder.py | 2 +-
 src/authentic2/middleware.py                    | 2 +-
 src/authentic2/models.py                        | 2 +-
 src/authentic2/saml/common.py                   | 2 +-
 src/authentic2/utils.py                         | 2 +-
 src/authentic2_auth_oidc/utils.py               | 2 +-
 src/authentic2_idp_cas/managers.py              | 2 +-
 src/authentic2_idp_oidc/utils.py                | 2 +-
 tests/conftest.py                               | 2 +-
 tests/test_admin.py                             | 3 +--
 tests/test_all.py                               | 2 +-
 tests/test_auth_oidc.py                         | 2 +-
 tests/test_cas.py                               | 4 +---
 tests/test_idp_oidc.py                          | 2 +-
 tests/test_idp_saml2.py                         | 2 +-
 tests/test_manager.py                           | 2 +-
 tests/test_registration.py                      | 2 +-
 tests/test_views.py                             | 3 +--
 tests/utils.py                                  | 2 +-
 20 files changed, 20 insertions(+), 24 deletions(-)

     from .decorators import SessionCache
     import urlparse
     from django.conf import settings
     from django.utils.six.moves.urllib import parse as urlparse
     from . import plugins, app_settings

     import logging
     import urlparse
     import urllib
     from xml.dom.minidom import parseString
-...
     from django.utils.translation import ugettext as _
     from django.core.urlresolvers import reverse
     from django.utils.http import urlquote
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2 import settings
     from authentic2.saml.common import error_page as base_error_page

     import urlparse
     import logging
     import datetime
     import random
-...
     from django.conf import settings
     from django.contrib import messages
     from django.utils.translation import ugettext as _
     from django.utils.six.moves.urllib import parse as urlparse
     from django.shortcuts import render
     from . import app_settings, utils, plugins

     import time
     import urlparse
     import uuid
     from django.utils.http import urlquote
     from django.conf import settings
     from django.db import models
     from django.db.models.query import Q
     from django.utils.translation import ugettext_lazy as _
     from django.utils.six.moves.urllib import parse as urlparse
     from django.core.exceptions import ValidationError, FieldDoesNotExist
     from django.contrib.contenttypes.models import ContentType

     import urlparse
     import os.path
     import urllib
     import httplib
-...
     from django.conf import settings
     from django.http import HttpResponseRedirect, Http404, HttpResponse
     from django.shortcuts import render
     from django.utils.six.moves.urllib import parse as urlparse
     from django.core.exceptions import ValidationError
     from authentic2.saml.models import (LibertyFederation, LibertyProvider,

     import time
     import logging
     import urllib
     import urlparse
     import uuid
     import datetime
     import copy
-...
     from django.utils import timezone
     from django.utils import html, http, six, encoding
     from django.utils.translation import ugettext as _, ungettext
     from django.utils.six.moves.urllib import parse as urlparse
     from django.shortcuts import resolve_url
     from django.template.loader import render_to_string, TemplateDoesNotExist
     from django.core.mail import send_mail

     import urlparse
     import datetime
     import base64
     import json
-...
     from django.utils.timezone import utc
     from django.shortcuts import get_object_or_404
     from django.utils.translation import ugettext as _
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2.decorators import GlobalCache
     from authentic2.models import Attribute

     import urlparse
     from datetime import timedelta
     from django.db import models
     from django.db.models import query
     from django.utils.timezone import now
     from django.utils.six.moves.urllib import parse as urlparse
     class TicketQuerySet(query.QuerySet):

     import json
     import hashlib
     import urlparse
     import base64
     import uuid
-...
     from django.core.exceptions import ImproperlyConfigured
     from django.conf import settings
     from django.utils.encoding import smart_bytes
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2 import hooks, crypto
     from authentic2.attributes_ng.engine import get_attributes

     import pytest
     import mock
     import urlparse
     import django_webtest
     from django.contrib.auth import get_user_model
     from django_rbac.utils import get_ou_model, get_role_model
     from django.conf import settings
     from django.utils.six.moves.urllib import parse as urlparse
     from pytest_django.migrations import DisableMigrations

     # -*- coding: utf-8 -*-
     from urlparse import urlparse
     from authentic2.custom_user.models import User
     from authentic2.models import Attribute
     from django.utils.six.moves.urllib.parse import urlparse
     import utils

     # -*- coding: utf-8 -*-
     import json
     import urlparse
     import base64
     import pytest
-...
     from django.contrib.auth import get_user_model
     from django.contrib.contenttypes.models import ContentType
     from django.utils.translation import ugettext as _
     from django.utils.six.moves.urllib import parse as urlparse
     from rest_framework import test
     from rest_framework import status

     # -*- coding: utf-8 -*-
     import datetime
     import pytest
     import urlparse
     import json
     import time
-...
     from django.core.urlresolvers import reverse
     from django.contrib.auth import get_user_model
     from django.utils.timezone import now
     from django.utils.six.moves.urllib import parse as urlparse
     from django_rbac.utils import get_ou_model

     import urlparse
     from django.test.client import RequestFactory, Client
     from django.test.utils import override_settings
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2.compat import get_user_model

     import urlparse
     import base64
     import json
     import datetime
-...
     from django.db.migrations.executor import MigrationExecutor
     from django.utils.timezone import now
     from django.contrib.auth import get_user_model
     from django.utils.six.moves.urllib import parse as urlparse
     User = get_user_model()

     import base64
     import unittest
     import StringIO
     import urlparse
     from lxml.html import parse
     from django.test import Client
-...
     from django.core.urlresolvers import reverse
     from django.core.files import File
     from django.utils.translation import gettext as _
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2.saml import models as saml_models
     from authentic2.a2_rbac.models import Role, OrganizationalUnit

     import pytest
     import json
     from urlparse import urlparse
     from django.core.urlresolvers import reverse
     from django.core import mail
-...
     from django_rbac.utils import get_ou_model, get_role_model
     from django.contrib.auth import get_user_model
     from django.utils.six.moves.urllib.parse import urlparse
     from utils import login, get_link_from_mail

     # -*- coding: utf-8 -*-
     import re
     from urlparse import urlparse
     from django.core.urlresolvers import reverse
     from django.contrib.auth import get_user_model, REDIRECT_FIELD_NAME
     from django.utils.http import urlquote
     from django.utils.six.moves.urllib.parse import urlparse
     from authentic2 import utils, models

     from urlparse import urlparse
     from utils import login
     import pytest
     from django.core.urlresolvers import reverse
     from django.utils.six.moves.urllib.parse import urlparse
     from authentic2.custom_user.models import User

     import re
     import base64
     import urlparse
     from contextlib import contextmanager
     from lxml import etree
-...
     from django.conf import settings
     from django.utils.encoding import iri_to_uri
     from django.shortcuts import resolve_url
     from django.utils.six.moves.urllib import parse as urlparse
     from authentic2 import utils
+    -

Projet

Général

Profil

Produits Entr'ouvert » Authentic 2

0001-python3-use-django.utils.six-url-parsing-functions-3.patch