ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
This commit is contained in:
Luke Rogers 2013-11-27 16:55:04 +13:00
commit aa8ab33ccb
31 changed files with 113 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
util/text.py
View file

@ -184,7 +184,7 @@ def truncate_str(content, length=100, suffix='...'):
# Expression to match some_token and some_token="with spaces" (and similarly
# for single-quoted strings).
split_re = re.compile(r"""((?:[^\s'"]*(?:(?:"(?:[^"\\]|\\.)*" | '(?:[""" \
split_re = re.compile(r"""((?:[^\s'"]*(?:(?:"(?:[^"\\]|\\.)*" | '(?:["""
r"""^'\\]|\\.)*')[^\s'"]*)+) | \S+)""", re.VERBOSE)