maintain python2.7 regex library compatibility

This commit is contained in:
Joe Harrison 2020-03-08 20:24:32 +00:00
parent 0dab7a4c63
commit 912cfa69b6

View File

@ -56,13 +56,13 @@ class TransitConnection(LineReceiver):
def lineReceived(self, line): def lineReceived(self, line):
# old: "please relay {64}\n" # old: "please relay {64}\n"
old = re.fullmatch(br"please relay (\w{64})", line) old = re.search(br"^please relay (\w{64})$", line)
if old: if old:
token = old.group(1) token = old.group(1)
return self._got_handshake(token, None) return self._got_handshake(token, None)
# new: "please relay {64} for side {16}\n" # new: "please relay {64} for side {16}\n"
new = re.fullmatch(br"please relay (\w{64}) for side (\w{16})", line) new = re.search(br"^please relay (\w{64}) for side (\w{16})$", line)
if new: if new:
token = new.group(1) token = new.group(1)
side = new.group(2) side = new.group(2)