trivial: apply pyupgdade -> remove six (#70693)
This commit is contained in:
parent
95c59b7dea
commit
f5e05ee948
|
@ -7,7 +7,6 @@ Build-Depends: debhelper-compat (= 12),
|
|||
python3-django,
|
||||
python3-requests,
|
||||
python3-setuptools,
|
||||
python3-six,
|
||||
python3-tz,
|
||||
dh-python,
|
||||
git
|
||||
|
|
|
@ -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 _
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import requests
|
||||
from six.moves.urllib.parse import parse_qs, urljoin
|
||||
from urllib.parse import parse_qs, urljoin
|
||||
|
||||
from .common import (
|
||||
CANCELLED,
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import requests
|
||||
from six.moves.urllib.parse import parse_qs, urljoin
|
||||
from urllib.parse import parse_qs, urljoin
|
||||
|
||||
from .common import (
|
||||
ACCEPTED,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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 (
|
||||
|
|
|
@ -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, _
|
||||
|
||||
|
|
1
setup.py
1
setup.py
|
@ -149,7 +149,6 @@ setuptools.setup(
|
|||
'pycryptodomex',
|
||||
'pytz',
|
||||
'requests',
|
||||
'six',
|
||||
'click',
|
||||
'zeep >= 2.5',
|
||||
],
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue