diff options
| -rw-r--r-- | mediagoblin/tools/url.py | 15 | ||||
| -rw-r--r-- | setup.py | 3 |
2 files changed, 14 insertions, 4 deletions
diff --git a/mediagoblin/tools/url.py b/mediagoblin/tools/url.py index de16536c..8604ad5f 100644 --- a/mediagoblin/tools/url.py +++ b/mediagoblin/tools/url.py @@ -16,7 +16,13 @@ import re # This import *is* used; see word.encode('tranlit/long') below. -import translitcodec +from unicodedata import normalize + +try: + import translitcodec + USING_TRANSLITCODEC = True +except ImportError: + USING_TRANSLITCODEC = False _punct_re = re.compile(r'[\t !"#$%&\'()*\-/<=>?@\[\\\]^_`{|},.]+') @@ -28,8 +34,11 @@ def slugify(text, delim=u'-'): """ result = [] for word in _punct_re.split(text.lower()): - # Uses translitcodec! - word = word.encode('translit/long') + if USING_TRANSLITCODEC: + word = word.encode('translit/long') + else: + word = normalize('NFKD', word).encode('ascii', 'ignore') + if word: result.append(word) return unicode(delim.join(result)) @@ -53,13 +53,14 @@ setup( 'jinja2', 'sphinx', 'Babel', - 'translitcodec', 'argparse', 'webtest', 'ConfigObj', 'Markdown', 'sqlalchemy>=0.7.0', 'sqlalchemy-migrate', + ## This is optional! + # 'translitcodec', ## For now we're expecting that users will install this from ## their package managers. # 'lxml', |