From 7a6cc8388bfec248883ab03455feccc4d0e87506 Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 8 Dec 2017 16:29:38 +0100 Subject: [PATCH] Ticket 49494 - python 2 bytes mode. Bug Description: a piece of python 2 support was removed that affected some tests. Fix Description: Add back the suport for non-bytes mode. https://pagure.io/389-ds-base/issue/49494 Author: wibrown Review by: ??? --- src/lib389/lib389/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib389/lib389/__init__.py b/src/lib389/lib389/__init__.py index e23ae91..6961d1f 100644 --- a/src/lib389/lib389/__init__.py +++ b/src/lib389/lib389/__init__.py @@ -1095,7 +1095,10 @@ class DirSrv(SimpleLDAPObject, object): if not uri: uri = self.toLDAPURL() self.log.debug('open(): Connecting to uri %s' % uri) - super(DirSrv, self).__init__(uri, bytes_mode=False, trace_level=TRACE_LEVEL) + if hasattr(ldap, 'PYLDAP_VERSION') and MAJOR >= 3: + super(DirSrv, self).__init__(uri, bytes_mode=False, trace_level=TRACE_LEVEL) + else: + super(DirSrv, self).__init__(uri, trace_level=TRACE_LEVEL) if certdir is None and self.isLocal: certdir = self.get_cert_dir() -- 1.8.3.1