import ... as

stroeder · stroeder · commit c81418ed9a7c · 2017-11-20T16:57:31.000Z
diff --git a/Lib/ldap/controls/__init__.py b/Lib/ldap/controls/__init__.py
@@ -148,7 +148,7 @@ def DecodeControlTuples(ldapControlTuples,knownLDAPControls=None):
       control.controlType,control.criticality = controlType,criticality
       try:
         control.decodeControlValue(encodedControlValue)
-      except PyAsn1Error,e:
+      except PyAsn1Error as e:
         if criticality:
           raise e
       else:
diff --git a/Lib/ldap/functions.py b/Lib/ldap/functions.py
@@ -64,7 +64,7 @@ def _ldap_function_call(lock, func, *args, **kwargs):
     try: # finally
         try: # error / result logging
             result = func(*args, **kwargs)
-        except LDAPError, err:
+        except LDAPError as err:
             if __debug__ and ldap._trace_level >= 2:
                 ldap._trace_file.write('=> LDAPError: %s\n' % (err))
             raise
diff --git a/Lib/ldap/ldapobject/reconnect.py b/Lib/ldap/ldapobject/reconnect.py
@@ -144,7 +144,7 @@ def reconnect(self, uri, retry_max=1, retry_delay=60.0):
                         SimpleLDAPObject.start_tls_s(self)
                     # Repeat last simple or SASL bind
                     self._apply_last_bind()
-                except (ldap.SERVER_DOWN, ldap.TIMEOUT), ldap_error:
+                except (ldap.SERVER_DOWN, ldap.TIMEOUT) as ldap_error:
                     if __debug__ and self._trace_level >= 1:
                         self._trace_file.write('*** %s reconnect to %s failed\n' % (
                             counter_text, uri
diff --git a/Lib/ldap/ldapobject/simple.py b/Lib/ldap/ldapobject/simple.py
@@ -94,7 +94,7 @@ def _ldap_call(self, func, *args, **kwargs):
                         diagnostic_message_success = self._l.get_option(ldap.OPT_DIAGNOSTIC_MESSAGE)
             finally:
                 self._ldap_object_lock.release()
-        except LDAPError, e:
+        except LDAPError as e:
             exc_type, exc_value, exc_traceback = sys.exc_info()
             try:
                 if 'info' not in e.args[0] and 'errno' in e.args[0]:
diff --git a/Tests/t_cext.py b/Tests/t_cext.py
@@ -253,7 +253,7 @@ def test_abandon(self):
         self.assertNone(ret)
         try:
             r = l.result4(m, _ldap.MSG_ALL, 0.3)  # (timeout /could/ be longer)
-        except _ldap.TIMEOUT, e:
+        except _ldap.TIMEOUT as e:
             pass
         else:
             self.fail("expected TIMEOUT, got %r" % r)
@@ -683,7 +683,7 @@ def test_errno107(self):
         try:
             m = l.simple_bind("", "")
             r = l.result4(m, _ldap.MSG_ALL, self.timeout)
-        except _ldap.SERVER_DOWN, ldap_err:
+        except _ldap.SERVER_DOWN as ldap_err:
             errno = ldap_err.args[0]['errno']
             if errno != 107:
                 self.fail("expected errno=107, got %d" % errno)
diff --git a/Tests/t_ldapobject.py b/Tests/t_ldapobject.py
@@ -159,7 +159,7 @@ def test004_errno107(self):
         try:
             m = l.simple_bind_s("", "")
             r = l.result4(m, ldap.MSG_ALL, self.timeout)
-        except ldap.SERVER_DOWN, ldap_err:
+        except ldap.SERVER_DOWN as ldap_err:
             errno = ldap_err.args[0]['errno']
             if errno != 107:
                 self.fail("expected errno=107, got %d" % errno)
@@ -234,7 +234,7 @@ def test103_reconnect_get_state(self):
                     {}
                 ),
                 '_options': [(17, 3)],
-                '_reconnects_done': 0L,
+                '_reconnects_done': 0,
                 '_retry_delay': 60.0,
                 '_retry_max': 1,
                 '_start_tls': 0,
diff --git a/Tests/t_ldif.py b/Tests/t_ldif.py
@@ -662,7 +662,7 @@ def test_bad_change_records(self):
             ldif_string = textwrap.dedent(bad_ldif_string).lstrip() + '\n'
             try:
                 res = self._parse_records(ldif_string)
-            except ValueError, value_error:
+            except ValueError as value_error:
                 pass
             else:
                 self.fail("should have raised ValueError: %r" % bad_ldif_string)
