@@ -29,9 +29,8 @@ def expand_pairlist(wildcardpl: List[str], available_pairs: List[str],
|
|||||||
except re.error as err:
|
except re.error as err:
|
||||||
raise ValueError(f"Wildcard error in {pair_wc}, {err}")
|
raise ValueError(f"Wildcard error in {pair_wc}, {err}")
|
||||||
|
|
||||||
for element in result:
|
result = [element for element in result if re.fullmatch(r'^[A-Za-z0-9:/-]+$', element)]
|
||||||
if not re.fullmatch(r'^[A-Za-z0-9:/-]+$', element):
|
|
||||||
result.remove(element)
|
|
||||||
else:
|
else:
|
||||||
for pair_wc in wildcardpl:
|
for pair_wc in wildcardpl:
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -1373,6 +1373,9 @@ def test_expand_pairlist(wildcardlist, pairs, expected):
|
|||||||
(['BTC/USDT:USDT'],
|
(['BTC/USDT:USDT'],
|
||||||
['BTC/USDT:USDT', 'BTC/USDT'],
|
['BTC/USDT:USDT', 'BTC/USDT'],
|
||||||
['BTC/USDT:USDT']),
|
['BTC/USDT:USDT']),
|
||||||
|
(['BB_BTC/USDT', 'CC_BTC/USDT', 'AA_ETH/USDT', 'XRP/USDT', 'ETH/USDT', 'XX_BTC/USDT'],
|
||||||
|
['BTC/USDT', 'ETH/USDT'],
|
||||||
|
['XRP/USDT', 'ETH/USDT']),
|
||||||
])
|
])
|
||||||
def test_expand_pairlist_keep_invalid(wildcardlist, pairs, expected):
|
def test_expand_pairlist_keep_invalid(wildcardlist, pairs, expected):
|
||||||
if expected is None:
|
if expected is None:
|
||||||
|
|||||||
Reference in New Issue
Block a user