Merge remote-tracking branch 'upstream/master'

1 files changed, 3 insertions, 2 deletions

diff --git a/src/saml2/entity.py b/src/saml2/entity.py
index e7ef879c..7e51d284 100644
--- a/src/saml2/entity.py
+++ b/src/saml2/entity.py
@@ -5,6 +5,7 @@ import logging
 from hashlib import sha1
 from Crypto.PublicKey import RSA
 import requests
+import six
 from saml2.metadata import ENDPOINTS
 from saml2.profile import paos, ecp
 from saml2.soap import parse_soap_enveloped_saml_artifact_resolve
@@ -157,7 +158,7 @@ class Entity(HTTPBase):
         self.sec = security_context(self.config)
 
         if virtual_organization:
-            if isinstance(virtual_organization, basestring):
+            if isinstance(virtual_organization, six.string_types):
                 self.vorg = self.config.vorg[virtual_organization]
             elif isinstance(virtual_organization, VirtualOrg):
                 self.vorg = virtual_organization
@@ -282,7 +283,7 @@ class Entity(HTTPBase):
         #logger.error("Bindings: %s" % bindings)
         #logger.error("Entities: %s" % self.metadata)
 
-        raise SAMLError("Unkown entity or unsupported bindings")
+        raise SAMLError("Unknown entity or unsupported bindings")
 
     def message_args(self, message_id=0):
         if not message_id: