openstack/python-troveclient
Code Issues Proposed changes

Make use of strutils.to_slug in slugify()

Browse Source 
Align with the change:
2070d4267c

Close-Bug #1241256

Change-Id: Idc16d75258baa1f5ee05ff48bfadc358c7655e55
This commit is contained in:
Kui Shi
2013-10-18 00:03:53 +08:00
parent 0127670f04
commit 5af5d6f30d
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
troveclient/compat/utils.py
View File

@@ -15,6 +15,8 @@
import os import os
import re import re
from troveclient.openstack.common import strutils
class HookableMixin(object): class HookableMixin(object):
"""Mixin so classes can register and run hooks.""" """Mixin so classes can register and run hooks."""
@@ -46,10 +48,6 @@ def env(*vars, **kwargs):
return kwargs.get('default', '') return kwargs.get('default', '')
_slugify_strip_re = re.compile(r'[^\w\s-]')
_slugify_hyphenate_re = re.compile(r'[-\s]+')
# http://code.activestate.com/recipes/ # http://code.activestate.com/recipes/
# 577257-slugify-make-a-string-usable-in-a-url-or-filename/ # 577257-slugify-make-a-string-usable-in-a-url-or-filename/
def slugify(value): def slugify(value):
@@ -58,10 +56,7 @@ def slugify(value):
and converts spaces to hyphens. and converts spaces to hyphens.
From Django's "django/template/defaultfilters.py". From Django's "django/template/defaultfilters.py".
Make use of strutils.to_slug from openstack common
""" """
import unicodedata return strutils.to_slug(value, incoming=None, errors="strict")
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)