aboutsummaryrefslogtreecommitdiff
path: root/Utils.py
diff options
context:
space:
mode:
authorGravatar jesopo2018-09-12 13:48:19 +0100
committerGravatar jesopo2018-09-12 13:48:19 +0100
commit461b4f4083ca4edc44192c37c583c911d258c3c7 (patch)
tree4c08abd349d266be6d5dd34fb1e3ec2536a844d2 /Utils.py
parent.lower() is also not valid for ascii case mapping (diff)
signature
Add missing argument to Utils._multi_replace calls in irc_lower
Diffstat (limited to 'Utils.py')
-rw-r--r--Utils.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/Utils.py b/Utils.py
index ad9b1ab9..6a9adf69 100644
--- a/Utils.py
+++ b/Utils.py
@@ -5,9 +5,10 @@ import bs4
USER_AGENT = ("Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 "
"(KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36")
REGEX_HTTP = re.compile("https?://", re.I)
-
-STRICT_RFC1459_UPPER = string.ascii_uppercase+r'\[]'
-STRICT_RFC1459_LOWER = string.ascii_lowercase+r'|{}'
+ASCII_UPPER = string.ascii_uppercase
+ASCII_LOWER = string.ascii_lowercase
+STRICT_RFC1459_UPPER = ASCII_UPPER+r'\[]'
+STRICT_RFC1459_LOWER = ASCII_LOWER+r'|{}'
RFC1459_UPPER = STRICT_RFC1459_UPPER+"^"
RFC1459_LOWER = STRICT_RFC1459_LOWER+"~"
@@ -26,11 +27,11 @@ def _multi_replace(s, chars1, chars2):
return s
def irc_lower(server, s):
if server.case_mapping == "ascii":
- return _multi_replace(string.ascii_uppercase, string.ascii_lowercase)
+ return _multi_replace(s, ASCII_UPPER, ASCII_LOWER)
elif server.case_mapping == "rfc1459":
- return _multi_replace(RFC1459_UPPER, RFC1459_LOWER)
+ return _multi_replace(s, RFC1459_UPPER, RFC1459_LOWER)
elif server.case_mapping == "strict-rfc1459":
- return _multi_replace(STRICT_RFC1459_UPPER, STRICT_RFC1459_LOWER)
+ return _multi_replace(s, STRICT_RFC1459_UPPER, STRICT_RFC1459_LOWER)
else:
raise ValueError("unknown casemapping '%s'" % server.case_mapping)