Merge "Fix unicode issue"

troveclient/tests/test_utils.py

@@ -18,6 +18,7 @@
 #    under the License.
 
 import os
+import six
 from testtools import TestCase
 from troveclient import utils
 
@@ -55,5 +56,5 @@ class UtilsTest(TestCase):
         import unicodedata  # noqa
 
         self.assertEqual('not_unicode', utils.slugify('not_unicode'))
-        self.assertEqual('unicode', utils.slugify(unicode('unicode')))
+        self.assertEqual('unicode', utils.slugify(six.u('unicode')))
         self.assertEqual('slugify-test', utils.slugify('SLUGIFY% test!'))

troveclient/utils.py

@@ -216,10 +216,6 @@ class HookableMixin(object):
             hook_func(*args, **kwargs)
 
 
-_slugify_strip_re = re.compile(r'[^\w\s-]')
-_slugify_hyphenate_re = re.compile(r'[-\s]+')
-
-
 # http://code.activestate.com/recipes/
 #   577257-slugify-make-a-string-usable-in-a-url-or-filename/
 def slugify(value):
@@ -228,10 +224,7 @@ def slugify(value):
     and converts spaces to hyphens.
 
     From Django's "django/template/defaultfilters.py".
+
+    Make use strutils.to_slug from openstack common
     """
-    import unicodedata
-    if not isinstance(value, unicode):
-        value = unicode(value)
-    value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
-    value = unicode(_slugify_strip_re.sub('', value).strip().lower())
-    return _slugify_hyphenate_re.sub('-', value)
+    return strutils.to_slug(value, incoming=None, errors="strict")