From 652dfdb12ebcdec64dba066550d893de17839365 Mon Sep 17 00:00:00 2001 From: wendyisgr33n Date: Mon, 30 Jul 2018 10:45:55 -0700 Subject: Fixed bytes/strings checks in lockdown.pxi for compatibility with Python2/3 --- cython/lockdown.pxi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cython/lockdown.pxi b/cython/lockdown.pxi index f249049..1bf7072 100644 --- a/cython/lockdown.pxi +++ b/cython/lockdown.pxi @@ -230,9 +230,9 @@ cdef class LockdownClient(PropertyListService): if issubclass(service, BaseService) and \ service.__service_name__ is not None \ - and isinstance(service.__service_name__, basestring): + and isinstance(service.__service_name__, (str, bytes)): c_service_name = service.__service_name__ - elif isinstance(service, basestring): + elif isinstance(service, (str, bytes)): c_service_name = service else: raise TypeError("LockdownClient.start_service() takes a BaseService or string as its first argument") @@ -253,7 +253,7 @@ cdef class LockdownClient(PropertyListService): if not hasattr(service_class, '__service_name__') and \ not service_class.__service_name__ is not None \ - and not isinstance(service_class.__service_name__, basestring): + and not isinstance(service_class.__service_name__, (str, bytes)): raise TypeError("LockdownClient.get_service_client() takes a BaseService as its first argument") descriptor = self.start_service(service_class) -- cgit v1.1-32-gdbae