View | Details | Raw Unified | Return to bug 46089 | Differences between
and this patch

Collapse All | Expand All

(-)a/Lib/ldap/ldapobject.py (-1 / +5 lines)
 Lines 1167-1172   class ReconnectLDAPObject(SimpleLDAPObject): Link Here 
1167
            SimpleLDAPObject.start_tls_s(self)
1167
            SimpleLDAPObject.start_tls_s(self)
1168
          # Repeat last simple or SASL bind
1168
          # Repeat last simple or SASL bind
1169
          self._apply_last_bind()
1169
          self._apply_last_bind()
1170
        except LDAPError as exc:
1171
          # Ensure self._l is not in a not fully initialized state
1172
          SimpleLDAPObject.unbind_s(self)
1173
        try:
1174
          raise exc
1170
        except (ldap.SERVER_DOWN,ldap.TIMEOUT):
1175
        except (ldap.SERVER_DOWN,ldap.TIMEOUT):
1171
          if __debug__ and self._trace_level>=1:
1176
          if __debug__ and self._trace_level>=1:
1172
            self._trace_file.write('*** %s reconnect to %s failed\n' % (
1177
            self._trace_file.write('*** %s reconnect to %s failed\n' % (
 Lines 1178-1184   class ReconnectLDAPObject(SimpleLDAPObject): Link Here 
1178
          if __debug__ and self._trace_level>=1:
1183
          if __debug__ and self._trace_level>=1:
1179
            self._trace_file.write('=> delay %s...\n' % (retry_delay))
1184
            self._trace_file.write('=> delay %s...\n' % (retry_delay))
1180
          time.sleep(retry_delay)
1185
          time.sleep(retry_delay)
1181
          SimpleLDAPObject.unbind_s(self)
1182
        else:
1186
        else:
1183
          if __debug__ and self._trace_level>=1:
1187
          if __debug__ and self._trace_level>=1:
1184
            self._trace_file.write('*** %s reconnect to %s successful => repeat last operation\n' % (
1188
            self._trace_file.write('*** %s reconnect to %s successful => repeat last operation\n' % (

Return to bug 46089