Newsletter in menu.

[wolnelektury.git] / src / funding / utils.py

diff --git a/src/funding/utils.py b/src/funding/utils.py
index 77d8981..afebd8a 100644 (file)
--- a/src/funding/utils.py
+++ b/src/funding/utils.py
@@ -1,18 +1,17 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re
 import string
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 import re
 import string

-from fnpdjango.utils.text.slughifi import char_map
+from fnpdjango.utils.text import char_map

 
 # PayU chokes on non-Polish diacritics.
 # Punctuation is handled correctly and escaped as needed,
 # with the notable exception of backslash.
 sane_in_payu_title = re.escape(
 
 # PayU chokes on non-Polish diacritics.
 # Punctuation is handled correctly and escaped as needed,
 # with the notable exception of backslash.
 sane_in_payu_title = re.escape(

-    string.uppercase +
-    string.lowercase +
-    u'ąćęłńóśźżĄĆĘŁŃÓŚŹŻ' +
+    string.ascii_uppercase +
+    string.ascii_lowercase +
+    'ąćęłńóśźżĄĆĘŁŃÓŚŹŻ' +

     string.digits +
     ' ' +
     "".join(set(string.punctuation) - set('\\'))
     string.digits +
     ' ' +
     "".join(set(string.punctuation) - set('\\'))


@@ -25,4 +24,4 @@ def replace_char(m):
 
 
 def sanitize_payment_title(value):
 
 
 def sanitize_payment_title(value):

-    return re.sub('[^%s]' % sane_in_payu_title, replace_char, unicode(value))
+    return re.sub('[^%s]' % sane_in_payu_title, replace_char, str(value))