@@ -40,17 +40,17 @@ def test_escape_dn_chars(self):
40
40
test function escape_dn_chars()
41
41
"""
42
42
self .assertEqual (ldap .dn .escape_dn_chars ('foobar' ), 'foobar' )
43
- self .assertEqual (ldap .dn .escape_dn_chars ('foo,bar' ), 'foo\ \ ,bar' )
44
- self .assertEqual (ldap .dn .escape_dn_chars ('foo=bar' ), 'foo\ \ =bar' )
43
+ self .assertEqual (ldap .dn .escape_dn_chars ('foo,bar' ), r 'foo\,bar' )
44
+ self .assertEqual (ldap .dn .escape_dn_chars ('foo=bar' ), r 'foo\=bar' )
45
45
self .assertEqual (ldap .dn .escape_dn_chars ('foo#bar' ), 'foo#bar' )
46
- self .assertEqual (ldap .dn .escape_dn_chars ('#foobar' ), ' \ \ #foobar' )
46
+ self .assertEqual (ldap .dn .escape_dn_chars ('#foobar' ), r' \#foobar' )
47
47
self .assertEqual (ldap .dn .escape_dn_chars ('foo bar' ), 'foo bar' )
48
- self .assertEqual (ldap .dn .escape_dn_chars (' foobar' ), ' \ \ foobar' )
49
- self .assertEqual (ldap .dn .escape_dn_chars (' ' ), ' \ \ ' )
50
- self .assertEqual (ldap .dn .escape_dn_chars (' ' ), ' \\ \ \ ' )
51
- self .assertEqual (ldap .dn .escape_dn_chars ('foobar ' ), 'foobar\ \ ' )
52
- self .assertEqual (ldap .dn .escape_dn_chars ('f+o>o,b<a;r="\00 "' ), 'f\\ +o\\ >o\\ ,b\\ <a\\ ;r\\ = \\ "\\ \ x00\ \ "' )
53
- self .assertEqual (ldap .dn .escape_dn_chars ('foo\\ ,bar' ), 'foo\\ \ \\\ ,bar' )
48
+ self .assertEqual (ldap .dn .escape_dn_chars (' foobar' ), r' \ foobar' )
49
+ self .assertEqual (ldap .dn .escape_dn_chars (' ' ), r' \ ' )
50
+ self .assertEqual (ldap .dn .escape_dn_chars (' ' ), r'\ \ ' )
51
+ self .assertEqual (ldap .dn .escape_dn_chars ('foobar ' ), r 'foobar\ ' )
52
+ self .assertEqual (ldap .dn .escape_dn_chars ('f+o>o,b<a;r="\00 "' ), r 'f\+o\>o\,b\<a\;r\=\ "\\x00\"' )
53
+ self .assertEqual (ldap .dn .escape_dn_chars (r 'foo\,bar' ), r 'foo\\\,bar' )
54
54
55
55
def test_str2dn (self ):
56
56
"""
@@ -95,7 +95,7 @@ def test_str2dn(self):
95
95
]
96
96
)
97
97
self .assertEqual (
98
- ldap .dn .str2dn ('uid=test\ \ , 42,ou=Testing,dc=example,dc=com' , flags = 0 ),
98
+ ldap .dn .str2dn (r 'uid=test\, 42,ou=Testing,dc=example,dc=com' , flags = 0 ),
99
99
[
100
100
[('uid' , 'test, 42' , 1 )],
101
101
[('ou' , 'Testing' , 1 )],
@@ -112,7 +112,7 @@ def test_str2dn(self):
112
112
]
113
113
)
114
114
self .assertEqual (
115
- ldap .dn .str2dn ('cn=\\ c3\\ a4\\ c3\\ b6\\ c3\\ bc\\ c3\\ 84\\ c3\\ 96\\ c3\\ 9c\\ c3 \ \ 9f,dc=example,dc=com' , flags = 0 ),
115
+ ldap .dn .str2dn (r 'cn=\c3\a4\c3\b6\c3\bc\c3\84\c3\96\c3\9c\c3 \9f,dc=example,dc=com' , flags = 0 ),
116
116
[
117
117
[('cn' , 'äöüÄÖÜß' , ldap .AVA_NONPRINTABLE )],
118
118
[('dc' , 'example' , 1 )],
@@ -168,7 +168,7 @@ def test_dn2str(self):
168
168
[('dc' , 'example' , 1 )],
169
169
[('dc' , 'com' , 1 )]
170
170
]),
171
- 'uid=test\ \ , 42,ou=Testing,dc=example,dc=com'
171
+ r 'uid=test\, 42,ou=Testing,dc=example,dc=com'
172
172
)
173
173
self .assertEqual (
174
174
ldap .dn .dn2str ([
@@ -323,15 +323,15 @@ def test_explode_dn(self):
323
323
['test42' , 'Testing' , 'example' , 'com' ]
324
324
)
325
325
self .assertEqual (
326
- ldap .dn .explode_dn ('uid=test\ \ , 42,ou=Testing,dc=example,dc=com' , flags = 0 ),
327
- ['uid=test\ \ , 42' , 'ou=Testing' , 'dc=example' , 'dc=com' ]
326
+ ldap .dn .explode_dn (r 'uid=test\, 42,ou=Testing,dc=example,dc=com' , flags = 0 ),
327
+ [r 'uid=test\, 42' , 'ou=Testing' , 'dc=example' , 'dc=com' ]
328
328
)
329
329
self .assertEqual (
330
330
ldap .dn .explode_dn ('cn=äöüÄÖÜß,dc=example,dc=com' , flags = 0 ),
331
331
['cn=äöüÄÖÜß' , 'dc=example' , 'dc=com' ]
332
332
)
333
333
self .assertEqual (
334
- ldap .dn .explode_dn ('cn=\\ c3\\ a4\\ c3\\ b6\\ c3\\ bc\\ c3\\ 84\\ c3\\ 96\\ c3\\ 9c\\ c3 \ \ 9f,dc=example,dc=com' , flags = 0 ),
334
+ ldap .dn .explode_dn (r 'cn=\c3\a4\c3\b6\c3\bc\c3\84\c3\96\c3\9c\c3 \9f,dc=example,dc=com' , flags = 0 ),
335
335
['cn=äöüÄÖÜß' , 'dc=example' , 'dc=com' ]
336
336
)
337
337
@@ -365,15 +365,15 @@ def test_explode_rdn(self):
365
365
['test42' ]
366
366
)
367
367
self .assertEqual (
368
- ldap .dn .explode_rdn ('uid=test\ \ + 42' , flags = 0 ),
369
- ['uid=test\ \ + 42' ]
368
+ ldap .dn .explode_rdn (r 'uid=test\+ 42' , flags = 0 ),
369
+ [r 'uid=test\+ 42' ]
370
370
)
371
371
self .assertEqual (
372
372
ldap .dn .explode_rdn ('cn=äöüÄÖÜß' , flags = 0 ),
373
373
['cn=äöüÄÖÜß' ]
374
374
)
375
375
self .assertEqual (
376
- ldap .dn .explode_rdn ('cn=\\ c3\\ a4\\ c3\\ b6\\ c3\\ bc\\ c3\\ 84\\ c3\\ 96\\ c3\\ 9c\\ c3 \ \ 9f' , flags = 0 ),
376
+ ldap .dn .explode_rdn (r 'cn=\c3\a4\c3\b6\c3\bc\c3\84\c3\96\c3\9c\c3 \9f' , flags = 0 ),
377
377
['cn=äöüÄÖÜß' ]
378
378
)
379
379
0 commit comments