dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IS_SLUG patch, thanks Jonathan, Niphlod and Villas

Browse Source
This commit is contained in:
mdipierro
2013-05-15 12:41:28 -05:00
parent 0b84911d38
commit a380ae69d5
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.4.6-stable+timestamp.2013.05.15.11.18.49 Version 2.4.6-stable+timestamp.2013.05.15.12.39.42
gluon/validators.py
+6 -5
View File
@@ -2514,17 +2514,18 @@ class IS_UPPER(Validator):
return (value.decode('utf8').upper().encode('utf8'), None) return (value.decode('utf8').upper().encode('utf8'), None)
def urlify(value, maxlen=80, keep_underscores=False): def urlify(s, maxlen=80, keep_underscores=False):
""" """
Convert incoming string to a simplified ASCII subset. Convert incoming string to a simplified ASCII subset.
if (keep_underscores): underscores are retained in the string if (keep_underscores): underscores are retained in the string
else: underscores are translated to hyphens (default) else: underscores are translated to hyphens (default)
""" """
s = value.lower() # to lowercase if isinstance(s, str):
s = s.decode('utf-8') # to utf-8 s = s.decode('utf-8') # to unicode
s = s.lower() # to lowercase
s = unicodedata.normalize('NFKD', s) # normalize eg è => e, ñ => n s = unicodedata.normalize('NFKD', s) # normalize eg è => e, ñ => n
s = s.encode('ASCII', 'ignore') # encode as ASCII s = s.encode('ascii', 'ignore') # encode as ASCII
s = re.sub('&\w+;', '', s) # strip html entities s = re.sub('&\w+?;', '', s) # strip html entities
if keep_underscores: if keep_underscores:
s = re.sub('\s+', '-', s) # whitespace to hyphens s = re.sub('\s+', '-', s) # whitespace to hyphens
s = re.sub('[^\w\-]', '', s) s = re.sub('[^\w\-]', '', s)