34d33
< __package__ = ''  # workaround for PEP 366
53,55c52,54
< 		self.logger.qualifier = self.resource_name     
< 		self.old_context_id = self.old.get('oxContextIDNum', [b''])[0].decode('utf-8') or default_context  # FIXME: default_context is int!
< 		self.new_context_id = self.new.get('oxContextIDNum', [b''])[0].decode('utf-8') or default_context
---
> 		self.logger.qualifier = self.resource_name
> 		self.old_context_id = self.old.get('oxContextIDNum', [b''])[0].decode('UTF-8') or str(default_context)
> 		self.new_context_id = self.new.get('oxContextIDNum', [b''])[0].decode('UTF-8') or str(default_context)
59c58
< 			return self.new['cn'][0].decode('utf-8')
---
> 			return self.new['cn'][0].decode('UTF-8')
61,62c60
< 			return self.old['cn'][0].decode('utf-8')
< 
---
> 			return self.old['cn'][0].decode('UTF-8')