CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-23 11:13:51 -05:00
Code Issues Packages Projects Releases Wiki Activity

[V3 Travis] Update travis to not skip pipfile lock... (#1678)

Browse Source 
* Update travis to not sip pipfile lock

update pipfile dependencies

additional black formatting pass to conform to black 18.5b

* .

* pin async timeout until further discussion of 3.5 support

* .
This commit is contained in:
Michael H
2018-05-18 21:48:22 -04:00
committed by palmtree5
parent 55afc7eb33
commit d3f406a34a
35 changed files with 214 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
redbot/core/i18n.py
View File

@@ -55,7 +55,7 @@ def _parse(translation_file):
# Don't check if step is WAITING_FOR_MSGID
untranslated = ""
translated = ""
data = line[len(MSGID):-1]
data = line[len(MSGID) : -1]
if len(data) == 0: # Multiline mode
step = IN_MSGID
else:
@@ -70,7 +70,7 @@ def _parse(translation_file):
step = WAITING_FOR_MSGSTR
if step is WAITING_FOR_MSGSTR and line.startswith(MSGSTR):
data = line[len(MSGSTR):-1]
data = line[len(MSGSTR) : -1]
if len(data) == 0: # Multiline mode
step = IN_MSGSTR
else:
@@ -109,8 +109,8 @@ def _normalize(string, remove_newline=False):
"""Normalizes the whitespace in a string; \s+ becomes one space."""
if not s:
return str(s) # not the same reference
starts_with_space = (s[0] in " \n\t\r")
ends_with_space = (s[-1] in " \n\t\r")
starts_with_space = s[0] in " \n\t\r"
ends_with_space = s[-1] in " \n\t\r"
if remove_newline:
newline_re = re.compile("[\r\n]+")
s = " ".join(filter(bool, newline_re.split(s)))