trivial: apply pyupgdade -> remove six (#70693)

This commit is contained in:
Frédéric Péters 2022-10-28 08:13:07 +02:00
parent 95c59b7dea
commit f5e05ee948
18 changed files with 16 additions and 20 deletions

1
debian/control vendored
View File

@ -7,7 +7,6 @@ Build-Depends: debhelper-compat (= 12),
python3-django, python3-django,
python3-requests, python3-requests,
python3-setuptools, python3-setuptools,
python3-six,
python3-tz, python3-tz,
dh-python, dh-python,
git git

View File

@ -24,8 +24,6 @@ from datetime import date
from decimal import ROUND_DOWN, Decimal from decimal import ROUND_DOWN, Decimal
from gettext import gettext as _ from gettext import gettext as _
import six
try: try:
if 'django' in sys.modules: if 'django' in sys.modules:
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _

View File

@ -18,7 +18,7 @@ import logging
import uuid import uuid
import warnings import warnings
from six.moves.urllib.parse import parse_qs, urlencode from urllib.parse import parse_qs, urlencode
from .common import ERROR, PAID, URL, WAITING, PaymentCommon, PaymentResponse, ResponseError, _, force_text from .common import ERROR, PAID, URL, WAITING, PaymentCommon, PaymentResponse, ResponseError, _, force_text

View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import requests import requests
from six.moves.urllib.parse import parse_qs, urljoin from urllib.parse import parse_qs, urljoin
from .common import ( from .common import (
CANCELLED, CANCELLED,

View File

@ -15,7 +15,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
import requests import requests
from six.moves.urllib.parse import parse_qs, urljoin from urllib.parse import parse_qs, urljoin
from .common import ( from .common import (
ACCEPTED, ACCEPTED,

View File

@ -18,7 +18,7 @@ import hashlib
import uuid import uuid
from decimal import ROUND_HALF_UP, Decimal from decimal import ROUND_HALF_UP, Decimal
from six.moves.urllib import parse as urlparse from urllib import parse as urlparse
from .common import ( from .common import (
ACCEPTED, ACCEPTED,

View File

@ -30,8 +30,8 @@ import requests
from Cryptodome.Hash import SHA from Cryptodome.Hash import SHA
from Cryptodome.PublicKey import RSA from Cryptodome.PublicKey import RSA
from Cryptodome.Signature import PKCS1_v1_5 from Cryptodome.Signature import PKCS1_v1_5
from six.moves.urllib import parse as urllib from urllib import parse as urllib
from six.moves.urllib import parse as urlparse from urllib import parse as urlparse
from . import cb from . import cb
from .common import ( from .common import (

View File

@ -29,7 +29,7 @@ import pytz
import requests import requests
import zeep import zeep
import zeep.exceptions import zeep.exceptions
from six.moves.urllib.parse import parse_qs from urllib.parse import parse_qs
from .common import ( from .common import (
CANCELLED, CANCELLED,

View File

@ -20,7 +20,7 @@ import functools
import lxml.etree as ET import lxml.etree as ET
import zeep import zeep
import zeep.exceptions import zeep.exceptions
from six.moves.urllib.parse import parse_qs, urljoin from urllib.parse import parse_qs, urljoin
from .common import ( from .common import (
CANCELLED, CANCELLED,

View File

@ -24,7 +24,7 @@ import warnings
import pytz import pytz
import requests import requests
from six.moves.urllib import parse as urlparse from urllib import parse as urlparse
from .common import ( from .common import (
CANCELED, CANCELED,

View File

@ -24,7 +24,7 @@ import string
import warnings import warnings
import pytz import pytz
from six.moves.urllib import parse as urlparse from urllib import parse as urlparse
from .cb import translate_cb_error_code from .cb import translate_cb_error_code
from .common import ( from .common import (

View File

@ -22,7 +22,7 @@ import re
import warnings import warnings
import pytz import pytz
from six.moves.urllib.parse import parse_qs, urlencode from urllib.parse import parse_qs, urlencode
from .common import CANCELLED, DENIED, ERROR, PAID, URL, PaymentCommon, PaymentResponse, ResponseError, _ from .common import CANCELLED, DENIED, ERROR, PAID, URL, PaymentCommon, PaymentResponse, ResponseError, _

View File

@ -149,7 +149,6 @@ setuptools.setup(
'pycryptodomex', 'pycryptodomex',
'pytz', 'pytz',
'requests', 'requests',
'six',
'click', 'click',
'zeep >= 2.5', 'zeep >= 2.5',
], ],

View File

@ -17,7 +17,7 @@
import datetime import datetime
import pytest import pytest
from six.moves.urllib.parse import parse_qs, urlparse from urllib.parse import parse_qs, urlparse
import eopayment import eopayment

View File

@ -17,7 +17,7 @@
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
import pytest import pytest
from six.moves.urllib import parse as urllib from urllib import parse as urllib
import eopayment import eopayment
import eopayment.ogone as ogone import eopayment.ogone as ogone

View File

@ -22,7 +22,7 @@ from unittest import TestCase, mock
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
import pytest import pytest
from six.moves.urllib import parse as urllib from urllib import parse as urllib
import eopayment import eopayment
import eopayment.paybox as paybox import eopayment.paybox as paybox

View File

@ -18,7 +18,7 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
import pytest import pytest
from six.moves.urllib import parse as urlparse from urllib import parse as urlparse
import eopayment import eopayment
from eopayment import ResponseError from eopayment import ResponseError

View File

@ -19,7 +19,7 @@ from decimal import Decimal
import pytest import pytest
import pytz import pytz
from six.moves.urllib.parse import parse_qs, urlparse from urllib.parse import parse_qs, urlparse
import eopayment import eopayment
import eopayment.tipi import eopayment.tipi