AaronFiore/electrum
1
0
Fork 0
Code Activity

fix deprecation warnings in regexes

Browse Source
This commit is contained in:
SomberNight
2018-09-20 18:31:17 +02:00
parent e4fd5ec1ae
commit 55b582511e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/network.py
View File

@@ -62,13 +62,13 @@ def parse_servers(result):
pruning_level = '-' pruning_level = '-'
if len(item) > 2: if len(item) > 2:
for v in item[2]: for v in item[2]:
if re.match("[st]\d*", v): if re.match(r"[st]\d*", v):
protocol, port = v[0], v[1:] protocol, port = v[0], v[1:]
if port == '': port = constants.net.DEFAULT_PORTS[protocol] if port == '': port = constants.net.DEFAULT_PORTS[protocol]
out[protocol] = port out[protocol] = port
elif re.match("v(.?)+", v): elif re.match("v(.?)+", v):
version = v[1:] version = v[1:]
elif re.match("p\d*", v): elif re.match(r"p\d*", v):
pruning_level = v[1:] pruning_level = v[1:]
if pruning_level == '': pruning_level = '0' if pruning_level == '': pruning_level = '0'
if out: if out:

2
electrum/storage.py
View File

@@ -54,7 +54,7 @@ def multisig_type(wallet_type):
otherwise return None.''' otherwise return None.'''
if not wallet_type: if not wallet_type:
return None return None
match = re.match('(\d+)of(\d+)', wallet_type) match = re.match(r'(\d+)of(\d+)', wallet_type)
if match: if match:
match = [int(x) for x in match.group(1, 2)] match = [int(x) for x in match.group(1, 2)]
return match return match