diff --git a/eopayment/__init__.py b/eopayment/__init__.py index 8d9e020..e7d0d38 100644 --- a/eopayment/__init__.py +++ b/eopayment/__init__.py @@ -20,8 +20,6 @@ import importlib import logging import pytz -import six - from .common import ( # noqa: F401 URL, HTML, FORM, RECEIVED, ACCEPTED, PAID, DENIED, CANCELED, CANCELLED, ERROR, WAITING, EXPIRED, force_text, @@ -31,10 +29,7 @@ from .common import ( # noqa: F401 __all__ = ['Payment', 'URL', 'HTML', 'FORM', 'SIPS', 'SYSTEMPAY', 'TIPI', 'DUMMY', 'get_backend', 'RECEIVED', 'ACCEPTED', 'PAID', 'DENIED', 'CANCELED', 'CANCELLED', 'ERROR', 'WAITING', - 'EXPIRED', 'get_backends', 'PAYFIP_WS', 'SAGA'] - -if six.PY3: - __all__.extend(['KEYWARE', 'MOLLIE']) + 'EXPIRED', 'get_backends', 'PAYFIP_WS', 'SAGA', 'KEYWARE', 'MOLLIE'] SIPS = 'sips' SIPS2 = 'sips2' diff --git a/eopayment/common.py b/eopayment/common.py index 3a03f17..522dd91 100644 --- a/eopayment/common.py +++ b/eopayment/common.py @@ -24,10 +24,7 @@ from decimal import ROUND_DOWN, Decimal import six -if six.PY3: - import html -else: - import cgi +import html from gettext import gettext as _ @@ -68,15 +65,10 @@ def force_text(s, encoding='utf-8'): return s try: if not issubclass(type(s), six.string_types): - if six.PY3: - if isinstance(s, bytes): - s = six.text_type(s, encoding) - else: - s = six.text_type(s) - elif hasattr(s, '__unicode__'): - s = six.text_type(s) + if isinstance(s, bytes): + s = six.text_type(s, encoding) else: - s = six.text_type(bytes(s), encoding) + s = six.text_type(s) else: s = s.decode(encoding) except UnicodeDecodeError: @@ -217,10 +209,8 @@ class Form(object): return s def escape(self, s): - if six.PY3: - return html.escape(force_text(s, self.encoding)) - else: - return cgi.escape(force_text(s, self.encoding)).encode(self.encoding) + return html.escape(force_text(s, self.encoding)) + def __str__(self): s = '