X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPeers.py;h=c24f925b09501537267bc410902b6c806303e144;hb=6e915d8a9ac5474c20482751ab6d24e6ce13aec9;hp=5b24ca233a62310d39dbb5cc8576d51f2c0c0aa3;hpb=647e5fff4e77d6139637a483b3d74cee597060de;p=plcapi.git diff --git a/PLC/Peers.py b/PLC/Peers.py index 5b24ca2..c24f925 100644 --- a/PLC/Peers.py +++ b/PLC/Peers.py @@ -3,7 +3,6 @@ # import re -from types import StringTypes import traceback from urllib.parse import urlparse @@ -291,7 +290,7 @@ class Peers (Table): if isinstance(peer_filter, (list, tuple, set)): # Separate the list into integers and strings ints = [x for x in peer_filter if isinstance(x, int)] - strs = [x for x in peer_filter if isinstance(x, StringTypes)] + strs = [x for x in peer_filter if isinstance(x, str)] peer_filter = Filter(Peer.fields, {'peer_id': ints, 'peername': strs}) sql += " AND (%s) %s" % peer_filter.sql(api, "OR") elif isinstance(peer_filter, dict): @@ -300,7 +299,7 @@ class Peers (Table): elif isinstance(peer_filter, int): peer_filter = Filter(Peer.fields, {'peer_id': peer_filter}) sql += " AND (%s) %s" % peer_filter.sql(api, "AND") - elif isinstance(peer_filter, StringTypes): + elif isinstance(peer_filter, str): peer_filter = Filter(Peer.fields, {'peername': peer_filter}) sql += " AND (%s) %s" % peer_filter.sql(api, "AND") else: