trivial: adjust import order after six cleanup (#70693)

eopayment/dummy.py

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

eopayment/keyware.py

@@ -14,9 +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/>.
 
-import requests
 from urllib.parse import parse_qs, urljoin
 
+import requests
+
 from .common import (
     CANCELLED,
     ERROR,

eopayment/mollie.py

@@ -14,9 +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/>.
 
-import requests
 from urllib.parse import parse_qs, urljoin
 
+import requests
+
 from .common import (
     ACCEPTED,
     CANCELLED,

eopayment/ogone.py

@@ -17,7 +17,6 @@
 import hashlib
 import uuid
 from decimal import ROUND_HALF_UP, Decimal
-
 from urllib import parse as urlparse
 
 from .common import (

eopayment/paybox.py

@@ -24,14 +24,14 @@ import re
 import uuid
 import warnings
 from collections import OrderedDict
+from urllib import parse as urllib
+from urllib import parse as urlparse
 
 import pytz
 import requests
 from Cryptodome.Hash import SHA
 from Cryptodome.PublicKey import RSA
 from Cryptodome.Signature import PKCS1_v1_5
-from urllib import parse as urllib
-from urllib import parse as urlparse
 
 from . import cb
 from .common import (

eopayment/payfip_ws.py

@@ -24,12 +24,12 @@ import random
 import re
 import unicodedata
 import xml.etree.ElementTree as ET
+from urllib.parse import parse_qs
 
 import pytz
 import requests
 import zeep
 import zeep.exceptions
-from urllib.parse import parse_qs
 
 from .common import (
     CANCELLED,

eopayment/saga.py

@@ -16,11 +16,11 @@
 
 
 import functools
+from urllib.parse import parse_qs, urljoin
 
 import lxml.etree as ET
 import zeep
 import zeep.exceptions
-from urllib.parse import parse_qs, urljoin
 
 from .common import (
     CANCELLED,

eopayment/sips2.py

@@ -21,10 +21,10 @@ import hmac
 import json
 import uuid
 import warnings
+from urllib import parse as urlparse
 
 import pytz
 import requests
-from urllib import parse as urlparse
 
 from .common import (
     CANCELED,

eopayment/systempayv2.py

@@ -22,9 +22,9 @@ import random
 import re
 import string
 import warnings
+from urllib import parse as urlparse
 
 import pytz
-from urllib import parse as urlparse
 
 from .cb import translate_cb_error_code
 from .common import (

eopayment/tipi.py

@@ -20,9 +20,9 @@ import logging
 import random
 import re
 import warnings
+from urllib.parse import parse_qs, urlencode
 
 import pytz
-from urllib.parse import parse_qs, urlencode
 
 from .common import CANCELLED, DENIED, ERROR, PAID, URL, PaymentCommon, PaymentResponse, ResponseError, _
 

tests/test_dummy.py

@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import datetime
+from urllib.parse import parse_qs, urlparse
 
 import pytest
-from urllib.parse import parse_qs, urlparse
 
 import eopayment
 

tests/test_ogone.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 urllib import parse as urllib
 from xml.etree import ElementTree as ET
 
 import pytest
-from urllib import parse as urllib
 
 import eopayment
 import eopayment.ogone as ogone

tests/test_paybox.py

@@ -19,10 +19,10 @@ import base64
 import codecs
 from decimal import Decimal
 from unittest import TestCase, mock
+from urllib import parse as urllib
 from xml.etree import ElementTree as ET
 
 import pytest
-from urllib import parse as urllib
 
 import eopayment
 import eopayment.paybox as paybox

tests/test_systempayv2.py

@@ -16,9 +16,9 @@
 
 
 from datetime import datetime, timedelta
+from urllib import parse as urlparse
 
 import pytest
-from urllib import parse as urlparse
 
 import eopayment
 from eopayment import ResponseError

tests/test_tipi.py

@@ -16,10 +16,10 @@
 
 import datetime
 from decimal import Decimal
+from urllib.parse import parse_qs, urlparse
 
 import pytest
 import pytz
-from urllib.parse import parse_qs, urlparse
 
 import eopayment
 import eopayment.tipi