From c028af586b9b24f79641c909046325f7ac06f59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 26 Mar 2018 20:06:19 +0200 Subject: [PATCH] common: add escape() method for python3 --- eopayment/common.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eopayment/common.py b/eopayment/common.py index a16efe5..258f856 100644 --- a/eopayment/common.py +++ b/eopayment/common.py @@ -2,11 +2,15 @@ import os.path import os import random import logging -import cgi from datetime import date import six +if six.PY3: + import html +else: + import cgi + __all__ = ['PaymentCommon', 'URL', 'HTML', 'RANDOM', 'RECEIVED', 'ACCEPTED', 'PAID', 'ERROR', 'WAITING'] @@ -162,7 +166,10 @@ class Form(object): return s def escape(self, s): - return cgi.escape(force_text(s, self.encoding).encode(self.encoding)) + if six.PY3: + return html.escape(force_text(s, self.encoding)) + else: + return cgi.escape(force_text(s, self.encoding)).encode(self.encoding) def __str__(self): s = '
' % (self.method, self.url)