Remove Python 2 syntax (#383)

https://github.com/python-ldap/python-ldap/pull/383

.gitignore

@@ -21,3 +21,6 @@ PKG-INFO
 
 # generated in the sample workflow
 /__venv__/
+
+# test dirs
+python-ldap-test-*

Demo/Lib/ldap/async/deltree.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import ldap,ldap.async
 
 class DeleteLeafs(ldap.async.AsyncSearchHandler):

Demo/Lib/ldapurl/urlsearch.py

@@ -3,7 +3,6 @@
 
 No output of LDAP data is produced except trace output.
 """
-from __future__ import print_function
 import sys,getpass,ldap,ldapurl
 
 try:

Demo/initialize.py

@@ -7,7 +7,6 @@
 ldaps://localhost:1391 (LDAP over SSL)
 ldapi://%2ftmp%2fopenldap2 (domain socket /tmp/openldap2)
 """
-from __future__ import print_function
 
 import sys,os,ldap
 

Demo/ldapcontrols.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ldap,ldapurl,pprint
 
 from ldap.controls import LDAPControl,BooleanControl

Demo/ldapurl_search.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import sys,pprint,ldap
 
 from ldap.ldapobject import LDAPObject

Demo/matchedvalues.py

@@ -27,7 +27,6 @@
 # Matched values control: (mail=*@example.org)
 # dn: uid=jsmith,ou=People,dc=example,dc=com
 # mail: jsmith@example.org
-from __future__ import print_function
 
 import ldap
 from ldap.controls import MatchedValuesControl
@@ -37,7 +36,7 @@ def print_result(search_result):
         print("dn: %s" % search_result[n][0])
         for attr in search_result[n][1].keys():
             for i in range(len(search_result[n][1][attr])):
-                print("%s: %s" % (attr, search_result[n][1][attr][i]))
+                print("{}: {}".format(attr, search_result[n][1][attr][i]))
         print
 
 

Demo/options.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import ldap
 
 host="localhost:1390"

Demo/page_control.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
-
 url = "ldap://localhost:1390"
 base = "dc=stroeder,dc=de"
 search_flt = r'(objectClass=*)'

Demo/paged_search_ext_s.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 url = "ldap://localhost:1390/"
 base = "dc=stroeder,dc=de"
 search_flt = r'(objectClass=*)'

Demo/passwd_ext_op.py

@@ -1,7 +1,6 @@
 """
 Example showing the use of the password extended operation.
 """
-from __future__ import print_function
 
 import sys,ldap,ldapurl,getpass
 

Demo/pyasn1/dds.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Demo script for Dynamic Entries (see RFC 2589)
 
@@ -8,7 +7,6 @@
 pyasn1-modules
 python-ldap 2.4+
 """
-from __future__ import print_function
 
 from ldap.extop.dds import RefreshRequest,RefreshResponse
 

Demo/pyasn1/derefcontrol.py

@@ -3,7 +3,6 @@
 This sample script demonstrates the use of the dereference control
 (see https://tools.ietf.org/html/draft-masarati-ldap-deref)
 """
-from __future__ import print_function
 
 import pprint,ldap,ldap.modlist,ldap.resiter
 

Demo/pyasn1/noopsearch.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Demo script for counting searching with OpenLDAP's no-op control
 
@@ -9,7 +8,6 @@
 pyasn1-modules
 python-ldap 2.4+
 """
-from __future__ import print_function
 
 import sys,ldap,ldapurl,getpass
 

Demo/pyasn1/ppolicy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Demo script for Password Policy Controls
 (see https://tools.ietf.org/html/draft-behera-ldap-password-policy)
@@ -9,7 +8,6 @@
 pyasn1-modules
 python-ldap 2.4+
 """
-from __future__ import print_function
 
 import sys,ldap,ldapurl,getpass
 

Demo/pyasn1/psearch.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 Demo script for Persistent Search Control
 (see https://tools.ietf.org/html/draft-ietf-ldapext-psearch)
@@ -10,7 +9,6 @@
 pyasn1-modules
 python-ldap 2.4+
 """
-from __future__ import print_function
 
 import sys,ldap,ldapurl,getpass
 

Demo/pyasn1/readentrycontrol.py

@@ -4,7 +4,6 @@
 
 Originally contributed by Andreas Hasenack <ahasenack@terra.com.br>
 """
-from __future__ import print_function
 
 import pprint,ldap,ldap.modlist
 

Demo/pyasn1/sessiontrack.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 demo_track_ldap_session.py
 
@@ -8,7 +7,6 @@
 https://tools.ietf.org/html/draft-wahl-ldap-session-03
 """
 
-from __future__ import print_function
 
 __version__ = '0.1'
 

Demo/pyasn1/syncrepl.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 This script implements a syncrepl consumer which syncs data from an OpenLDAP
 server to a local (shelve) database.
@@ -8,7 +7,6 @@
 
 The bound user needs read access to the attributes entryDN and entryCSN.
 """
-from __future__ import print_function
 
 # Import modules from Python standard lib
 import logging

Demo/rename.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import ldap
 from getpass import getpass
 

Demo/resiter.py

@@ -4,7 +4,6 @@
 
 See https://www.python-ldap.org for details.
 """
-from __future__ import print_function
 
 import ldap,ldap.resiter
 

Demo/sasl_bind.py

@@ -1,6 +1,5 @@
 # For documentation, see comments in Module/LDAPObject.c and the
 # ldap.sasl module documentation.
-from __future__ import print_function
 
 import ldap,ldap.sasl
 

Demo/schema.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys,ldap,ldap.schema
 
 schema_attrs = ldap.schema.SCHEMA_ATTRS

Demo/schema_tree.py

@@ -4,7 +4,6 @@
 
 Usage: schema_oc_tree.py [--html] [LDAP URL]
 """
-from __future__ import print_function
 
 import sys,getopt,ldap,ldap.schema
 
@@ -28,10 +27,10 @@ def HTMLSchemaTree(schema,se_class,se_tree,se_oid,level):
   se_obj = schema.get_obj(se_class,se_oid)
   if se_obj!=None:
     print("""
-    <dt><strong>%s (%s)</strong></dt>
+    <dt><strong>{} ({})</strong></dt>
     <dd>
-      %s
-    """ % (', '.join(se_obj.names),se_obj.oid,se_obj.desc))
+      {}
+    """.format(', '.join(se_obj.names),se_obj.oid,se_obj.desc))
   if se_tree[se_oid]:
     print('<dl>')
     for sub_se_oid in se_tree[se_oid]:

Demo/simple.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys,getpass
 import ldap
 
@@ -86,7 +85,7 @@
 	("labeleduri",			["labeleduri"]),
 	("manager",			["cn=Jaga Indulska"]),
 	("reports",			["reports"]),
-	("jpegPhoto",			[open("/www/leonard/leonard.jpg","r").read()]),
+	("jpegPhoto",			[open("/www/leonard/leonard.jpg").read()]),
 	("uid",				["leonard"]),
 	("userPassword",		[""])
 

Demo/simplebrowse.py

@@ -3,7 +3,6 @@
 #
 # simple LDAP server browsing example
 #
-from __future__ import print_function
 
 import ldap
 from traceback import print_exc

Doc/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 #
 # python-ldap documentation build configuration file, created by
 # sphinx-quickstart on Sat Mar 29 15:08:17 2008.

Lib/ldap/__init__.py

@@ -33,7 +33,7 @@
 
 import _ldap
 assert _ldap.__version__==__version__, \
-       ImportError('ldap %s and _ldap %s version mismatch!' % (__version__,_ldap.__version__))
+       ImportError(f'ldap {__version__} and _ldap {_ldap.__version__} version mismatch!')
 from _ldap import *
 # call into libldap to initialize it right now
 LIBLDAP_API_INFO = _ldap.get_option(_ldap.OPT_API_INFO)
@@ -83,14 +83,14 @@ def acquire(self):
     if __debug__:
       global _trace_level
       if _trace_level>=self._min_trace_level:
-        _trace_file.write('***%s.acquire() %s %s\n' % (self.__class__.__name__,repr(self),self._desc))
+        _trace_file.write('***{}.acquire() {} {}\n'.format(self.__class__.__name__,repr(self),self._desc))
     return self._lock.acquire()
 
   def release(self):
     if __debug__:
       global _trace_level
       if _trace_level>=self._min_trace_level:
-        _trace_file.write('***%s.release() %s %s\n' % (self.__class__.__name__,repr(self),self._desc))
+        _trace_file.write('***{}.release() {} {}\n'.format(self.__class__.__name__,repr(self),self._desc))
     return self._lock.release()
 
 

Lib/ldap/asyncsearch.py

@@ -30,7 +30,7 @@ def __init__(self,receivedResultType,expectedResultTypes):
     Exception.__init__(self)
 
   def __str__(self):
-    return 'Received wrong result type %s (expected one of %s).' % (
+    return 'Received wrong result type {} (expected one of {}).'.format(
       self.receivedResultType,
       ', '.join(self.expectedResultTypes),
     )

Lib/ldap/constants.py

@@ -13,16 +13,15 @@
 # This module cannot import anything from ldap.
 # When building documentation, it is used to initialize ldap.__init__.
 
-from __future__ import print_function
 
-class Constant(object):
+class Constant:
     """Base class for a definition of an OpenLDAP constant
     """
 
     def __init__(self, name, optional=False, requirements=(), doc=None):
         self.name = name
         if optional:
-            self_requirement = 'defined(LDAP_{})'.format(self.name)
+            self_requirement = f'defined(LDAP_{self.name})'
             requirements = list(requirements) + [self_requirement]
         self.requirements = requirements
         self.doc = self.__doc__ = doc
@@ -50,7 +49,7 @@ class TLSInt(Int):
     def __init__(self, *args, **kwargs):
         requrements = list(kwargs.get('requirements', ()))
         kwargs['requirements'] = ['HAVE_TLS'] + requrements
-        super(TLSInt, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
 
 class Feature(Constant):
@@ -70,7 +69,7 @@ class Feature(Constant):
 
 
     def __init__(self, name, c_feature, **kwargs):
-        super(Feature, self).__init__(name, **kwargs)
+        super().__init__(name, **kwargs)
         self.c_feature = c_feature
 
 
@@ -392,7 +391,7 @@ def pop_requirement():
             if requirement not in current_requirements:
                 current_requirements.append(requirement)
                 print()
-                print('#if {}'.format(requirement))
+                print(f'#if {requirement}')
 
         print(definition.c_template.format(self=definition))
 

Lib/ldap/controls/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 controls.py - support classes for LDAP controls
 
@@ -13,7 +12,7 @@
 
 import _ldap
 assert _ldap.__version__==__version__, \
-       ImportError('ldap %s and _ldap %s version mismatch!' % (__version__,_ldap.__version__))
+       ImportError(f'ldap {__version__} and _ldap {_ldap.__version__} version mismatch!')
 
 import ldap
 

Lib/ldap/controls/deref.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.deref - classes for
 (see https://tools.ietf.org/html/draft-masarati-ldap-deref)

Lib/ldap/controls/libldap.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 controls.libldap - LDAP controls wrapper classes with en-/decoding done
 by OpenLDAP functions
@@ -10,7 +9,7 @@
 
 import _ldap
 assert _ldap.__version__==__version__, \
-       ImportError('ldap %s and _ldap %s version mismatch!' % (__version__,_ldap.__version__))
+       ImportError(f'ldap {__version__} and _ldap {_ldap.__version__} version mismatch!')
 
 import ldap
 

Lib/ldap/controls/openldap.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.openldap - classes for OpenLDAP-specific controls
 

Lib/ldap/controls/pagedresults.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.paged - classes for Simple Paged control
 (see RFC 2696)

Lib/ldap/controls/ppolicy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.ppolicy - classes for Password Policy controls
 (see https://tools.ietf.org/html/draft-behera-ldap-password-policy)

Lib/ldap/controls/psearch.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.psearch - classes for Persistent Search Control
 (see https://tools.ietf.org/html/draft-ietf-ldapext-psearch)

Lib/ldap/controls/pwdpolicy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.pwdpolicy - classes for Password Policy controls
 (see https://tools.ietf.org/html/draft-vchu-ldap-pwd-policy)

Lib/ldap/controls/readentry.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 ldap.controls.readentry - classes for the Read Entry controls
 (see RFC 4527)