openstack/deb-python-pyldap
Code Issues Proposed changes

ldif: Cleanup Py3 compatibility code.

Browse Source 
- Avoid using outdated type names (unicode)
- Reuse compatibility code
This commit is contained in:
Raphaël Barrois
2015-10-19 23:04:24 +02:00
parent ef4b669ec9
commit 9e913fe156
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/ldap/compat.py
View File

@@ -6,6 +6,7 @@ if sys.version_info[0] < 3:
from UserDict import UserDict from UserDict import UserDict
from urllib import quote from urllib import quote
from urllib import unquote as urllib_unquote from urllib import unquote as urllib_unquote
from urlparse import urlparse
def unquote(uri): def unquote(uri):
"""Specialized unquote that uses UTF-8 for parsing.""" """Specialized unquote that uses UTF-8 for parsing."""
@@ -14,4 +15,4 @@ if sys.version_info[0] < 3:
return unquoted.decode('utf-8') return unquoted.decode('utf-8')
else: else:
from collections import UserDict from collections import UserDict
from urllib.parse import quote, unquote from urllib.parse import quote, unquote, urlparse

16
Lib/ldif.py
View File

@@ -37,13 +37,7 @@ except ImportError:
except ImportError: except ImportError:
from io import StringIO from io import StringIO
try: from ldap.compat import urlparse
from urllib.parse import urlparse
except ImportError:
from urlparse import urlparse
if sys.version_info > (3, 0):
unicode = str
attrtype_pattern = r'[\w;.-]+(;[\w_-]+)*' attrtype_pattern = r'[\w;.-]+(;[\w_-]+)*'
attrvalue_pattern = r'(([^,]|\\,)+|".*?")' attrvalue_pattern = r'(([^,]|\\,)+|".*?")'
@@ -155,7 +149,7 @@ class LDIFWriter:
""" """
if self._needs_base64_encoding(attr_type,attr_value): if self._needs_base64_encoding(attr_type,attr_value):
# Encode with base64 # Encode with base64
if isinstance(attr_value, unicode): if not isinstance(attr_value, bytes):
attr_value = attr_value.encode('utf-8') attr_value = attr_value.encode('utf-8')
encoded = base64.encodestring(attr_value).decode('ascii') encoded = base64.encodestring(attr_value).decode('ascii')
encoded = encoded.replace('\n','') encoded = encoded.replace('\n','')
@@ -213,7 +207,7 @@ class LDIFWriter:
or a list with a modify list like for LDAPObject.modify(). or a list with a modify list like for LDAPObject.modify().
""" """
# Start with line containing the distinguished name # Start with line containing the distinguished name
if isinstance(dn, unicode): if not isinstance(dn, bytes):
dn = dn.encode('utf-8') dn = dn.encode('utf-8')
self._unparseAttrTypeandValue('dn', dn) self._unparseAttrTypeandValue('dn', dn)
# Dispatch to record type specific writers # Dispatch to record type specific writers
@@ -348,12 +342,12 @@ class LDIFParser:
value_spec = unfolded_line[colon_pos:colon_pos+2] value_spec = unfolded_line[colon_pos:colon_pos+2]
if value_spec==': ': if value_spec==': ':
attr_value = unfolded_line[colon_pos+2:].lstrip() attr_value = unfolded_line[colon_pos+2:].lstrip()
if isinstance(unfolded_line, unicode): if not isinstance(unfolded_line, bytes):
attr_value = attr_value.encode('utf-8') attr_value = attr_value.encode('utf-8')
elif value_spec=='::': elif value_spec=='::':
# attribute value needs base64-decoding # attribute value needs base64-decoding
attr_value = unfolded_line[colon_pos+2:] attr_value = unfolded_line[colon_pos+2:]
if isinstance(attr_value, unicode): if not isinstance(attr_value, bytes):
attr_value = attr_value.encode('ascii') attr_value = attr_value.encode('ascii')
attr_value = base64.decodestring(attr_value) attr_value = base64.decodestring(attr_value)
elif value_spec==':<': elif value_spec==':<':