From a256bca39854b197829c51d426c42084d5cc0637 Mon Sep 17 00:00:00 2001 From: Fabrice Salvaire Date: Wed, 19 Oct 2016 21:20:31 +0200 Subject: [PATCH] Py3 fixes --- budget/tests.py | 2 +- budget/utils.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/budget/tests.py b/budget/tests.py index eea75372..b80ea99d 100644 --- a/budget/tests.py +++ b/budget/tests.py @@ -56,7 +56,7 @@ class TestCase(unittest.TestCase): }) def create_project(self, name): - models.db.session.add(models.Project(id=name, name=unicode(name), + models.db.session.add(models.Project(id=name, name=name, password=name, contact_email="%s@notmyidea.org" % name)) models.db.session.commit() diff --git a/budget/utils.py b/budget/utils.py index c849af0c..2a8e59ae 100644 --- a/budget/utils.py +++ b/budget/utils.py @@ -12,10 +12,10 @@ def slugify(value): Copy/Pasted from ametaireau/pelican/utils itself took from django sources. """ - if type(value) == unicode: + if type(value) == str: import unicodedata - value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') - value = unicode(re.sub('[^\w\s-]', '', value).strip().lower()) + value = unicodedata.normalize('NFKD', value) + value = re.sub('[^\w\s-]', '', value).strip().lower() return re.sub('[-\s]+', '-', value)