entrouvert/wcs
entrouvert
/
wcs
14
1
Fork 0
Code Issues Pull Requests 35 Releases Activity

misc: update simplify for py3 (#36515)

This commit is contained in:
Frédéric Péters 2019-11-12 13:51:33 +01:00
parent d6bce19689
commit d4840892b4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wcs/qommon/misc.py
View File

@ -37,6 +37,7 @@ except ImportError:
from django.conf import settings
from django.utils import datetime_safe
from django.utils import six
from django.utils.encoding import force_text
from django.utils.html import strip_tags
from django.template import engines, TemplateSyntaxError, VariableDoesNotExist
@ -160,14 +161,16 @@ def get_provider_key(provider_id):
def simplify(s, space='-'):
if s is None:
return ''
if not isinstance(s, unicode):
if not isinstance(s, six.text_type):
if get_publisher() and get_publisher().site_charset:
s = force_text('%s' % s, get_publisher().site_charset, errors='ignore')
else:
s = force_text('%s' % s, 'iso-8859-1', errors='ignore')
s = unicodedata.normalize('NFKD', s).encode('ascii', 'ignore')
s = force_text(unicodedata.normalize('NFKD', s).encode('ascii', 'ignore'))
s = re.sub(r'[^\w\s\'%s]' % space, '', s).strip().lower()
s = re.sub(r'[\s\'%s]+' % space, space, s)
if six.PY2:
return s.encode('ascii')
return s
def get_datetime_language():