From 8e74d949b5a95c880d7d3100cb0b0e0d86c6edf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Mon, 26 Mar 2018 09:35:45 +0200
Subject: [PATCH] python3: use six to get urlparse/urllib modules

---
 eopayment/dummy.py        | 5 +----
 eopayment/ogone.py        | 2 +-
 eopayment/paybox.py       | 6 ++++--
 eopayment/sips.py         | 2 +-
 eopayment/sips2.py        | 2 +-
 eopayment/spplus.py       | 4 ++--
 eopayment/systempayv2.py  | 2 +-
 eopayment/tipi.py         | 4 ++--
 tests/test_ogone.py       | 2 +-
 tests/test_paybox.py      | 2 +-
 tests/test_systempayv2.py | 2 +-
 11 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/eopayment/dummy.py b/eopayment/dummy.py
index 2b79258..62eb9f9 100644
--- a/eopayment/dummy.py
+++ b/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
 
diff --git a/eopayment/ogone.py b/eopayment/ogone.py
index 8edb106..14295a5 100644
--- a/eopayment/ogone.py
+++ b/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,
diff --git a/eopayment/paybox.py b/eopayment/paybox.py
index 53bf456..15ea18e 100644
--- a/eopayment/paybox.py
+++ b/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
diff --git a/eopayment/sips.py b/eopayment/sips.py
index bc17b16..8201aab 100644
--- a/eopayment/sips.py
+++ b/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
diff --git a/eopayment/sips2.py b/eopayment/sips2.py
index 1e4cc52..78a407f 100644
--- a/eopayment/sips2.py
+++ b/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
diff --git a/eopayment/spplus.py b/eopayment/spplus.py
index 53fd6e5..3bbcd50 100644
--- a/eopayment/spplus.py
+++ b/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
diff --git a/eopayment/systempayv2.py b/eopayment/systempayv2.py
index 66ea38e..8d1c12f 100644
--- a/eopayment/systempayv2.py
+++ b/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 _
 
diff --git a/eopayment/tipi.py b/eopayment/tipi.py
index 1b60e3e..de131b1 100644
--- a/eopayment/tipi.py
+++ b/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
diff --git a/tests/test_ogone.py b/tests/test_ogone.py
index 025dcdb..b667445 100644
--- a/tests/test_ogone.py
+++ b/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
diff --git a/tests/test_paybox.py b/tests/test_paybox.py
index 0a8de60..2e9156b 100644
--- a/tests/test_paybox.py
+++ b/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
diff --git a/tests/test_systempayv2.py b/tests/test_systempayv2.py
index 25ad104..c558bbf 100644
--- a/tests/test_systempayv2.py
+++ b/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