openstack/deb-python-pyldap
Code Issues Proposed changes

Merge pull request #24 from encukou/py3-schemaelement

Browse Source 
[Py3] schema: Decode schema elements to str when loading
This commit is contained in:
Petr Viktorin
2015-10-13 15:00:43 +02:00
parent 1b5f815d36 c85f2cc926
commit 1bd672f96b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Lib/ldap/schema/models.py
View File

@@ -33,6 +33,7 @@ class SchemaElement:
schema_element_str schema_element_str
String which contains the schema element description to be parsed. String which contains the schema element description to be parsed.
(Bytestrings are decoded using UTF-8)
Class attributes: Class attributes:
@@ -47,6 +48,8 @@ class SchemaElement:
} }
def __init__(self,schema_element_str=None): def __init__(self,schema_element_str=None):
if sys.version_info >= (3, 0) and isinstance(schema_element_str, bytes):
schema_element_str = schema_element_str.decode('utf-8')
if schema_element_str: if schema_element_str:
l = split_tokens(schema_element_str,self.token_defaults) l = split_tokens(schema_element_str,self.token_defaults)
self.set_id(l[1]) self.set_id(l[1])