trivial: adjust import order after six cleanup (#70693)
This commit is contained in:
parent
f5e05ee948
commit
97b6bac733
|
@ -17,7 +17,6 @@
|
||||||
import logging
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
from 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
|
||||||
|
|
|
@ -14,9 +14,10 @@
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import requests
|
|
||||||
from urllib.parse import parse_qs, urljoin
|
from urllib.parse import parse_qs, urljoin
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
CANCELLED,
|
CANCELLED,
|
||||||
ERROR,
|
ERROR,
|
||||||
|
|
|
@ -14,9 +14,10 @@
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
import requests
|
|
||||||
from urllib.parse import parse_qs, urljoin
|
from urllib.parse import parse_qs, urljoin
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
ACCEPTED,
|
ACCEPTED,
|
||||||
CANCELLED,
|
CANCELLED,
|
||||||
|
|
|
@ -17,7 +17,6 @@
|
||||||
import hashlib
|
import hashlib
|
||||||
import uuid
|
import uuid
|
||||||
from decimal import ROUND_HALF_UP, Decimal
|
from decimal import ROUND_HALF_UP, Decimal
|
||||||
|
|
||||||
from urllib import parse as urlparse
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
|
|
|
@ -24,14 +24,14 @@ import re
|
||||||
import uuid
|
import uuid
|
||||||
import warnings
|
import warnings
|
||||||
from collections import OrderedDict
|
from collections import OrderedDict
|
||||||
|
from urllib import parse as urllib
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
import requests
|
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 urllib import parse as urllib
|
|
||||||
from urllib import parse as urlparse
|
|
||||||
|
|
||||||
from . import cb
|
from . import cb
|
||||||
from .common import (
|
from .common import (
|
||||||
|
|
|
@ -24,12 +24,12 @@ import random
|
||||||
import re
|
import re
|
||||||
import unicodedata
|
import unicodedata
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
|
from urllib.parse import parse_qs
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
import requests
|
import requests
|
||||||
import zeep
|
import zeep
|
||||||
import zeep.exceptions
|
import zeep.exceptions
|
||||||
from urllib.parse import parse_qs
|
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
CANCELLED,
|
CANCELLED,
|
||||||
|
|
|
@ -16,11 +16,11 @@
|
||||||
|
|
||||||
|
|
||||||
import functools
|
import functools
|
||||||
|
from urllib.parse import parse_qs, urljoin
|
||||||
|
|
||||||
import lxml.etree as ET
|
import lxml.etree as ET
|
||||||
import zeep
|
import zeep
|
||||||
import zeep.exceptions
|
import zeep.exceptions
|
||||||
from urllib.parse import parse_qs, urljoin
|
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
CANCELLED,
|
CANCELLED,
|
||||||
|
|
|
@ -21,10 +21,10 @@ import hmac
|
||||||
import json
|
import json
|
||||||
import uuid
|
import uuid
|
||||||
import warnings
|
import warnings
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
import requests
|
import requests
|
||||||
from urllib import parse as urlparse
|
|
||||||
|
|
||||||
from .common import (
|
from .common import (
|
||||||
CANCELED,
|
CANCELED,
|
||||||
|
|
|
@ -22,9 +22,9 @@ import random
|
||||||
import re
|
import re
|
||||||
import string
|
import string
|
||||||
import warnings
|
import warnings
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
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 (
|
||||||
|
|
|
@ -20,9 +20,9 @@ import logging
|
||||||
import random
|
import random
|
||||||
import re
|
import re
|
||||||
import warnings
|
import warnings
|
||||||
|
from urllib.parse import parse_qs, urlencode
|
||||||
|
|
||||||
import pytz
|
import pytz
|
||||||
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, _
|
||||||
|
|
||||||
|
|
|
@ -15,9 +15,9 @@
|
||||||
# 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 datetime
|
import datetime
|
||||||
|
from urllib.parse import parse_qs, urlparse
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from urllib.parse import parse_qs, urlparse
|
|
||||||
|
|
||||||
import eopayment
|
import eopayment
|
||||||
|
|
||||||
|
|
|
@ -14,10 +14,10 @@
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# 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/>.
|
# 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
|
from xml.etree import ElementTree as ET
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from urllib import parse as urllib
|
|
||||||
|
|
||||||
import eopayment
|
import eopayment
|
||||||
import eopayment.ogone as ogone
|
import eopayment.ogone as ogone
|
||||||
|
|
|
@ -19,10 +19,10 @@ import base64
|
||||||
import codecs
|
import codecs
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
from unittest import TestCase, mock
|
from unittest import TestCase, mock
|
||||||
|
from urllib import parse as urllib
|
||||||
from xml.etree import ElementTree as ET
|
from xml.etree import ElementTree as ET
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from urllib import parse as urllib
|
|
||||||
|
|
||||||
import eopayment
|
import eopayment
|
||||||
import eopayment.paybox as paybox
|
import eopayment.paybox as paybox
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
|
|
||||||
|
|
||||||
from datetime import datetime, timedelta
|
from datetime import datetime, timedelta
|
||||||
|
from urllib import parse as urlparse
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
from urllib import parse as urlparse
|
|
||||||
|
|
||||||
import eopayment
|
import eopayment
|
||||||
from eopayment import ResponseError
|
from eopayment import ResponseError
|
||||||
|
|
|
@ -16,10 +16,10 @@
|
||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
from decimal import Decimal
|
from decimal import Decimal
|
||||||
|
from urllib.parse import parse_qs, urlparse
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import pytz
|
import pytz
|
||||||
from urllib.parse import parse_qs, urlparse
|
|
||||||
|
|
||||||
import eopayment
|
import eopayment
|
||||||
import eopayment.tipi
|
import eopayment.tipi
|
||||||
|
|
Loading…
Reference in New Issue