From f5e05ee948bfb624c6b42c6bb4bb1f7bce4ccd38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 28 Oct 2022 08:13:07 +0200 Subject: [PATCH] trivial: apply pyupgdade -> remove six (#70693) --- debian/control | 1 - eopayment/common.py | 2 -- eopayment/dummy.py | 2 +- eopayment/keyware.py | 2 +- eopayment/mollie.py | 2 +- eopayment/ogone.py | 2 +- eopayment/paybox.py | 4 ++-- eopayment/payfip_ws.py | 2 +- eopayment/saga.py | 2 +- eopayment/sips2.py | 2 +- eopayment/systempayv2.py | 2 +- eopayment/tipi.py | 2 +- setup.py | 1 - tests/test_dummy.py | 2 +- tests/test_ogone.py | 2 +- tests/test_paybox.py | 2 +- tests/test_systempayv2.py | 2 +- tests/test_tipi.py | 2 +- 18 files changed, 16 insertions(+), 20 deletions(-) diff --git a/debian/control b/debian/control index 35fcb60..619de18 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,6 @@ Build-Depends: debhelper-compat (= 12), python3-django, python3-requests, python3-setuptools, - python3-six, python3-tz, dh-python, git diff --git a/eopayment/common.py b/eopayment/common.py index bb24712..63634aa 100644 --- a/eopayment/common.py +++ b/eopayment/common.py @@ -24,8 +24,6 @@ from datetime import date from decimal import ROUND_DOWN, Decimal from gettext import gettext as _ -import six - try: if 'django' in sys.modules: from django.utils.translation import gettext_lazy as _ diff --git a/eopayment/dummy.py b/eopayment/dummy.py index 2c67de1..90e0682 100644 --- a/eopayment/dummy.py +++ b/eopayment/dummy.py @@ -18,7 +18,7 @@ import logging import uuid 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 diff --git a/eopayment/keyware.py b/eopayment/keyware.py index e297a90..7dd4420 100644 --- a/eopayment/keyware.py +++ b/eopayment/keyware.py @@ -15,7 +15,7 @@ # along with this program. If not, see . import requests -from six.moves.urllib.parse import parse_qs, urljoin +from urllib.parse import parse_qs, urljoin from .common import ( CANCELLED, diff --git a/eopayment/mollie.py b/eopayment/mollie.py index 0b2517c..c162dac 100644 --- a/eopayment/mollie.py +++ b/eopayment/mollie.py @@ -15,7 +15,7 @@ # along with this program. If not, see . import requests -from six.moves.urllib.parse import parse_qs, urljoin +from urllib.parse import parse_qs, urljoin from .common import ( ACCEPTED, diff --git a/eopayment/ogone.py b/eopayment/ogone.py index 135ec5c..fbae582 100644 --- a/eopayment/ogone.py +++ b/eopayment/ogone.py @@ -18,7 +18,7 @@ import hashlib import uuid from decimal import ROUND_HALF_UP, Decimal -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from .common import ( ACCEPTED, diff --git a/eopayment/paybox.py b/eopayment/paybox.py index d1987b1..967b257 100644 --- a/eopayment/paybox.py +++ b/eopayment/paybox.py @@ -30,8 +30,8 @@ import requests from Cryptodome.Hash import SHA from Cryptodome.PublicKey import RSA from Cryptodome.Signature import PKCS1_v1_5 -from six.moves.urllib import parse as urllib -from six.moves.urllib import parse as urlparse +from urllib import parse as urllib +from urllib import parse as urlparse from . import cb from .common import ( diff --git a/eopayment/payfip_ws.py b/eopayment/payfip_ws.py index 16eb13b..a3fe914 100644 --- a/eopayment/payfip_ws.py +++ b/eopayment/payfip_ws.py @@ -29,7 +29,7 @@ import pytz import requests import zeep import zeep.exceptions -from six.moves.urllib.parse import parse_qs +from urllib.parse import parse_qs from .common import ( CANCELLED, diff --git a/eopayment/saga.py b/eopayment/saga.py index 243aeb2..4aa7e91 100644 --- a/eopayment/saga.py +++ b/eopayment/saga.py @@ -20,7 +20,7 @@ import functools import lxml.etree as ET import zeep import zeep.exceptions -from six.moves.urllib.parse import parse_qs, urljoin +from urllib.parse import parse_qs, urljoin from .common import ( CANCELLED, diff --git a/eopayment/sips2.py b/eopayment/sips2.py index f9fc9e1..72ecdf2 100644 --- a/eopayment/sips2.py +++ b/eopayment/sips2.py @@ -24,7 +24,7 @@ import warnings import pytz import requests -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from .common import ( CANCELED, diff --git a/eopayment/systempayv2.py b/eopayment/systempayv2.py index 72baf95..ad67927 100644 --- a/eopayment/systempayv2.py +++ b/eopayment/systempayv2.py @@ -24,7 +24,7 @@ import string import warnings import pytz -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse from .cb import translate_cb_error_code from .common import ( diff --git a/eopayment/tipi.py b/eopayment/tipi.py index 0753185..b00ce25 100644 --- a/eopayment/tipi.py +++ b/eopayment/tipi.py @@ -22,7 +22,7 @@ import re import warnings 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, _ diff --git a/setup.py b/setup.py index bde3a18..f07d834 100755 --- a/setup.py +++ b/setup.py @@ -149,7 +149,6 @@ setuptools.setup( 'pycryptodomex', 'pytz', 'requests', - 'six', 'click', 'zeep >= 2.5', ], diff --git a/tests/test_dummy.py b/tests/test_dummy.py index f70a402..78f60b0 100644 --- a/tests/test_dummy.py +++ b/tests/test_dummy.py @@ -17,7 +17,7 @@ import datetime import pytest -from six.moves.urllib.parse import parse_qs, urlparse +from urllib.parse import parse_qs, urlparse import eopayment diff --git a/tests/test_ogone.py b/tests/test_ogone.py index c797f3d..413458f 100644 --- a/tests/test_ogone.py +++ b/tests/test_ogone.py @@ -17,7 +17,7 @@ from xml.etree import ElementTree as ET import pytest -from six.moves.urllib import parse as urllib +from urllib import parse as urllib import eopayment import eopayment.ogone as ogone diff --git a/tests/test_paybox.py b/tests/test_paybox.py index b9092b0..abaafb1 100644 --- a/tests/test_paybox.py +++ b/tests/test_paybox.py @@ -22,7 +22,7 @@ from unittest import TestCase, mock from xml.etree import ElementTree as ET import pytest -from six.moves.urllib import parse as urllib +from urllib import parse as urllib import eopayment import eopayment.paybox as paybox diff --git a/tests/test_systempayv2.py b/tests/test_systempayv2.py index fb3d986..d7a6cf4 100644 --- a/tests/test_systempayv2.py +++ b/tests/test_systempayv2.py @@ -18,7 +18,7 @@ from datetime import datetime, timedelta import pytest -from six.moves.urllib import parse as urlparse +from urllib import parse as urlparse import eopayment from eopayment import ResponseError diff --git a/tests/test_tipi.py b/tests/test_tipi.py index 6c483e1..6289ce2 100644 --- a/tests/test_tipi.py +++ b/tests/test_tipi.py @@ -19,7 +19,7 @@ from decimal import Decimal import pytest import pytz -from six.moves.urllib.parse import parse_qs, urlparse +from urllib.parse import parse_qs, urlparse import eopayment import eopayment.tipi