Merge commit from fork

Update tests to expect \00 and verify RFC-compliant escaping

Author: droideck

Lib/ldap/dn.py

@@ -26,7 +26,8 @@ def escape_dn_chars(s):
     s = s.replace('>' ,'\\>')
     s = s.replace(';' ,'\\;')
     s = s.replace('=' ,'\\=')
-    s = s.replace('\000' ,'\\\000')
+    # RFC 4514 requires NULL (U+0000) to be escaped as hex pair "\00"
+    s = s.replace('\x00' ,'\\00')
     if s[-1]==' ':
       s = ''.join((s[:-1],'\\ '))
     if s[0]=='#' or s[0]==' ':

Tests/t_ldap_dn.py

@@ -49,7 +49,7 @@ def test_escape_dn_chars(self):
         self.assertEqual(ldap.dn.escape_dn_chars(' '), r'\ ')
         self.assertEqual(ldap.dn.escape_dn_chars('  '), r'\ \ ')
         self.assertEqual(ldap.dn.escape_dn_chars('foobar '), r'foobar\ ')
-        self.assertEqual(ldap.dn.escape_dn_chars('f+o>o,b<a;r="\00"'), 'f\\+o\\>o\\,b\\<a\\;r\\=\\"\\\x00\\"')
+        self.assertEqual(ldap.dn.escape_dn_chars('f+o>o,b<a;r="\00"'), r'f\+o\>o\,b\<a\;r\=\"\00\"')
         self.assertEqual(ldap.dn.escape_dn_chars(r'foo\,bar'), r'foo\\\,bar')
 
     def test_str2dn(self):