-from types import StringTypes
import string
from PLC.Faults import *
if not len(login_base):
raise PLCInvalidArgument("Login base must be specified")
- if not set(login_base).issubset(string.lowercase + string.digits + '.'):
+ if not set(login_base).issubset(string.ascii_lowercase + string.digits + '.'):
raise PLCInvalidArgument("Login base must consist only of lowercase ASCII letters or numbers or dots")
conflicts = Sites(self.api, [login_base])
if isinstance(site_filter, (list, tuple, set)):
# Separate the list into integers and strings
ints = [x for x in site_filter if isinstance(x, int)]
- strs = [x for x in site_filter if isinstance(x, StringTypes)]
+ strs = [x for x in site_filter if isinstance(x, str)]
site_filter = Filter(Site.fields, {'site_id': ints, 'login_base': strs})
sql += " AND (%s) %s" % site_filter.sql(api, "OR")
elif isinstance(site_filter, dict):
allowed_fields=dict(list(Site.fields.items())+list(Site.tags.items()))
site_filter = Filter(allowed_fields, site_filter)
sql += " AND (%s) %s" % site_filter.sql(api, "AND")
- elif isinstance (site_filter, StringTypes):
+ elif isinstance (site_filter, str):
site_filter = Filter(Site.fields, {'login_base':site_filter})
sql += " AND (%s) %s" % site_filter.sql(api, "AND")
elif isinstance (site_filter, int):