phyks/bmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tools.py for python3

Browse Source
This commit is contained in:
Phyks 2014-08-03 00:40:37 +02:00
parent 15ccbb95c9
commit 07d8d43a7c
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libbmc/tools.py
View File

@ -27,10 +27,14 @@ def slugify(value):
From Django's "django/template/defaultfilters.py". From Django's "django/template/defaultfilters.py".
""" """
import unicodedata import unicodedata
if not isinstance(value, unicode): try:
value = unicode(value) unicode_type = unicode
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore') except NameError:
value = unicode(_slugify_strip_re.sub('', value).strip()) unicode_type = str
if not isinstance(value, unicode_type):
value = unicode_type(value)
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
value = unicode_type(_slugify_strip_re.sub('', value).strip())
return _slugify_hyphenate_re.sub('_', value) return _slugify_hyphenate_re.sub('_', value)
@ -51,7 +55,7 @@ def getExtension(filename):
def replaceAll(text, dic): def replaceAll(text, dic):
"""Replace all the dic keys by the associated item in text""" """Replace all the dic keys by the associated item in text"""
for i, j in dic.iteritems(): for i, j in dic.items():
text = text.replace(i, j) text = text.replace(i, j)
return text return text
@ -59,7 +63,11 @@ def replaceAll(text, dic):
def rawInput(string): def rawInput(string):
"""Flush stdin and then prompt the user for something""" """Flush stdin and then prompt the user for something"""
tcflush(sys.stdin, TCIOFLUSH) tcflush(sys.stdin, TCIOFLUSH)
return raw_input(string).decode('utf-8') try:
input = raw_input
except NameError:
pass
return input(string).decode('utf-8')
def warning(*objs): def warning(*objs):