Merge branch 'release/6.9.4'

praekeltfoundation · Jul 27, 2018 · 2c18818 · 2c18818
2 parents dc257ea + 0d330b0
commit 2c18818
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,5 +1,9 @@
 CHANGE LOG
 ==========
+6.9.4
+-----
+- Bug fix: converting an already unicode str to unicode error in the clean_name attr
+
 6.9.3
 -----
 - Bug fix: unicode support for SurveyAbstractFormField's clean_name attribute

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.9.3
+6.9.4
diff --git a/molo/surveys/models.py b/molo/surveys/models.py
@@ -83,7 +83,7 @@ class Meta:
     @property
     def clean_name(self):
         return str(slugify(text_type(unidecode(
-            u'{} {}'.format(self.pk, smart_str(self.label))))))
+            '{} {}'.format(self.pk, smart_str(self.label))))))
 
 
 class TermsAndConditionsIndexPage(TranslatablePageMixinNotRoutable, MoloPage):