Use six.string_types instead of basestring

In python3 strings are different, so basestring isn't available
anymore.  While examining these uses, all of them still work fine with
six.string_types and should not need any new special handling to deal
with bytes.

1 files changed, 3 insertions, 2 deletions

diff --git a/src/saml2/server.py b/src/saml2/server.py
index ce703cd4..58017b1b 100644
--- a/src/saml2/server.py
+++ b/src/saml2/server.py
@@ -10,6 +10,7 @@ import os
 
 import importlib
 import shelve
+import six
 import threading
 
 from saml2 import saml
@@ -89,7 +90,7 @@ class Server(Entity):
         _spec = self.config.getattr("session_storage", "idp")
         if not _spec:
             return SessionStorage()
-        elif isinstance(_spec, basestring):
+        elif isinstance(_spec, six.string_types):
             if _spec.lower() == "memory":
                 return SessionStorage()
         else:  # Should be tuple
@@ -116,7 +117,7 @@ class Server(Entity):
         typ = ""
         if not dbspec:
             idb = {}
-        elif isinstance(dbspec, basestring):
+        elif isinstance(dbspec, six.string_types):
             idb = shelve.open(dbspec, writeback=True)
         else:  # database spec is a a 2-tuple (type, address)
             #print(>> sys.stderr, "DBSPEC: %s" % (dbspec,))