python3: use six to get urlparse/urllib modules

eopayment/dummy.py

@@ -5,10 +5,7 @@ import warnings
 
 def N_(message): return message
 
-try:
-    from cgi import parse_qs
-except ImportError:
-    from urlparse import parse_qs
+from six.moves.urllib.parse import parse_qs
 
 from .common import PaymentCommon, URL, PaymentResponse, PAID, ERROR, WAITING, ResponseError
 

eopayment/ogone.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import hashlib
 import string
-import urlparse
+from six.moves.urllib import parse as urlparse
 from decimal import Decimal, ROUND_HALF_UP
 
 from .common import (PaymentCommon, PaymentResponse, FORM, CANCELLED, PAID,

eopayment/paybox.py

@@ -9,8 +9,10 @@ from decimal import Decimal, ROUND_DOWN
 from Crypto.Signature import PKCS1_v1_5
 from Crypto.PublicKey import RSA
 from Crypto.Hash import SHA
-import urlparse
-import urllib
+
+from six.moves.urllib import parse as urlparse
+from six.moves.urllib import parse as urllib
+
 import base64
 from gettext import gettext as _
 import string

eopayment/sips.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-import urlparse
+from six.moves.urllib import parse as urlparse
 import string
 import subprocess
 from decimal import Decimal

eopayment/sips2.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import collections
 import json
-import urlparse
+from six.moves.urllib import parse as urlparse
 import string
 from decimal import Decimal
 import uuid

eopayment/spplus.py

@@ -4,8 +4,8 @@ import binascii
 from gettext import gettext as _
 import hmac
 import hashlib
-import urlparse
-import urllib
+from six.moves.urllib import parse as urlparse
+from six.moves.urllib import parse as urllib
 import string
 import datetime as dt
 import logging

eopayment/systempayv2.py

@@ -4,7 +4,7 @@ import datetime as dt
 import hashlib
 import logging
 import string
-import urlparse
+from six.moves.urllib import parse as urlparse
 import warnings
 from gettext import gettext as _
 

eopayment/tipi.py

@@ -3,8 +3,8 @@
 from decimal import Decimal, ROUND_DOWN
 from .common import (PaymentCommon, PaymentResponse, URL, PAID, DENIED,
         CANCELLED, ERROR, ResponseError)
-from urllib import urlencode
-from urlparse import parse_qs
+from six.moves.urllib.parse import urlencode, parse_qs
+
 from gettext import gettext as _
 import logging
 import warnings

tests/test_ogone.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from unittest import TestCase
-import urllib
+from six.moves.urllib import parse as urllib
 
 import eopayment
 import eopayment.ogone as ogone

tests/test_paybox.py

@@ -3,7 +3,7 @@
 from unittest import TestCase
 from decimal import Decimal
 import base64
-import urllib
+from six.moves.urllib import parse as urllib
 
 import eopayment.paybox as paybox
 import eopayment

tests/test_systempayv2.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import urlparse
+from six.moves.urllib import parse as urlparse
 
 from eopayment.systempayv2 import Payment, VADS_CUST_FIRST_NAME, \
     VADS_CUST_LAST_NAME, PAID