Lib/ldap/controls/sss: use str instead of basestring on Python 3

mistotebe · encukou · commit 2059c13bf1ad · 2019-01-30T14:47:34.000+01:00
* Python 3 has no basestring, use str instead * Add a very minimal test to create a SSSRequestControl Fixes: #255
diff --git a/Lib/ldap/controls/sss.py b/Lib/ldap/controls/sss.py
@@ -12,6 +12,8 @@
 ]
 
 
+import sys
+
 import ldap
 from ldap.ldapobject import LDAPObject
 from ldap.controls import (RequestControl, ResponseControl,
@@ -20,6 +22,10 @@
 from pyasn1.type import univ, namedtype, tag, namedval, constraint
 from pyasn1.codec.ber import encoder, decoder
 
+PY2 = sys.version_info[0] <= 2
+if not PY2:
+  basestring = str
+
 
 #    SortKeyList ::= SEQUENCE OF SEQUENCE {
 #                     attributeType   AttributeDescription,
diff --git a/Tests/t_ldap_controls_sss.py b/Tests/t_ldap_controls_sss.py
@@ -0,0 +1,17 @@
+import os
+import unittest
+
+# Switch off processing .ldaprc or ldap.conf before importing _ldap
+os.environ['LDAPNOINIT'] = '1'
+
+from ldap.controls import sss
+
+
+class TestControlsPPolicy(unittest.TestCase):
+    def test_create_sss_request_control(self):
+        control = sss.SSSRequestControl(ordering_rules=['-uidNumber'])
+        self.assertEqual(control.ordering_rules, ['-uidNumber'])
+
+
+if __name__ == '__main__':
+    unittest.main()
