Skip to content

Commit c6d61e2

Browse files
author
stroeder
committed
avoid deprecated method alias unittest.TestCase.assertEquals
1 parent cdc169a commit c6d61e2

File tree

8 files changed

+226
-225
lines changed

8 files changed

+226
-225
lines changed

‎CHANGES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Lib/
1212

1313
Tests/
1414
* added sub-module for testing class ldap.cidict.cidict
15+
* avoid deprecated method alias unittest.TestCase.assertEquals
1516

1617
----------------------------------------------------------------
1718
Released 2.4.41 2017-07-12
@@ -1475,4 +1476,4 @@ Released 2.0.0pre02 2002-02-01
14751476
----------------------------------------------------------------
14761477
Released 1.10alpha3 2000-09-19
14771478

1478-
$Id: CHANGES,v 1.456 2017/08/16 13:29:05 stroeder Exp $
1479+
$Id: CHANGES,v 1.457 2017/09/04 07:47:29 stroeder Exp $

‎Tests/t_cext.py

Lines changed: 109 additions & 109 deletions
Large diffs are not rendered by default.

‎Tests/t_cidict.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
See https://www.python-ldap.org/ for details.
66
7-
$Id: t_cidict.py,v 1.2 2017/08/15 16:14:04 stroeder Exp $
7+
$Id: t_cidict.py,v 1.3 2017/09/04 07:47:29 stroeder Exp $
88
"""
99

1010
# from Python's standard lib
@@ -23,26 +23,26 @@ def test_cidict(self):
2323
"""
2424
test function is_dn()
2525
"""
26-
self.assertEquals(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
26+
self.assertEqual(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
2727
data = {
2828
'AbCDeF':123,
2929
}
3030
cix = ldap.cidict.cidict(data)
31-
self.assertEquals(cix["ABCDEF"], 123)
32-
self.assertEquals(cix.get("ABCDEF", None), 123)
33-
self.assertEquals(cix.get("not existent", None), None)
31+
self.assertEqual(cix["ABCDEF"], 123)
32+
self.assertEqual(cix.get("ABCDEF", None), 123)
33+
self.assertEqual(cix.get("not existent", None), None)
3434
cix["xYZ"] = 987
35-
self.assertEquals(cix["XyZ"], 987)
36-
self.assertEquals(cix.get("xyz", None), 987)
35+
self.assertEqual(cix["XyZ"], 987)
36+
self.assertEqual(cix.get("xyz", None), 987)
3737
cix_keys = cix.keys()
3838
cix_keys.sort()
39-
self.assertEquals(cix_keys, ['AbCDeF','xYZ'])
39+
self.assertEqual(cix_keys, ['AbCDeF','xYZ'])
4040
cix_items = cix.items()
4141
cix_items.sort()
42-
self.assertEquals(cix_items, [('AbCDeF',123), ('xYZ',987)])
42+
self.assertEqual(cix_items, [('AbCDeF',123), ('xYZ',987)])
4343
del cix["abcdEF"]
44-
self.assertEquals(cix._keys.has_key("abcdef"), False)
45-
self.assertEquals(cix._keys.has_key("AbCDef"), False)
44+
self.assertEqual(cix._keys.has_key("abcdef"), False)
45+
self.assertEqual(cix._keys.has_key("AbCDef"), False)
4646

4747

4848
if __name__ == '__main__':

‎Tests/t_ldap_dn.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
See https://www.python-ldap.org/ for details.
66
7-
$Id: t_ldap_dn.py,v 1.5 2017/08/15 16:21:59 stroeder Exp $
7+
$Id: t_ldap_dn.py,v 1.6 2017/09/04 07:47:29 stroeder Exp $
88
"""
99

1010
# from Python's standard lib
@@ -23,13 +23,13 @@ def test_is_dn(self):
2323
"""
2424
test function is_dn()
2525
"""
26-
self.assertEquals(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
27-
self.assertEquals(ldap.dn.is_dn('-cn=foobar,ou=ae-dir'), False)
28-
self.assertEquals(ldap.dn.is_dn(';cn=foobar,ou=ae-dir'), False)
29-
self.assertEquals(ldap.dn.is_dn(',cn=foobar,ou=ae-dir'), False)
30-
self.assertEquals(ldap.dn.is_dn('cn=foobar,ou=ae-dir,'), False)
31-
self.assertEquals(ldap.dn.is_dn('uid=xkcd,cn=foobar,ou=ae-dir'), True)
32-
self.assertEquals(
26+
self.assertEqual(ldap.dn.is_dn('foobar,ou=ae-dir'), False)
27+
self.assertEqual(ldap.dn.is_dn('-cn=foobar,ou=ae-dir'), False)
28+
self.assertEqual(ldap.dn.is_dn(';cn=foobar,ou=ae-dir'), False)
29+
self.assertEqual(ldap.dn.is_dn(',cn=foobar,ou=ae-dir'), False)
30+
self.assertEqual(ldap.dn.is_dn('cn=foobar,ou=ae-dir,'), False)
31+
self.assertEqual(ldap.dn.is_dn('uid=xkcd,cn=foobar,ou=ae-dir'), True)
32+
self.assertEqual(
3333
ldap.dn.is_dn(
3434
'cn=\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c.o=\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c\xc3\x9f'
3535
),

‎Tests/t_ldap_filter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
See https://www.python-ldap.org/ for details.
66
7-
$Id: t_ldap_filter.py,v 1.4 2017/08/15 16:21:59 stroeder Exp $
7+
$Id: t_ldap_filter.py,v 1.5 2017/09/04 07:47:29 stroeder Exp $
88
"""
99

1010
# from Python's standard lib
@@ -23,15 +23,15 @@ def test_escape_filter_chars_mode0(self):
2323
"""
2424
test function escape_filter_chars() with escape_mode=0
2525
"""
26-
self.assertEquals(
26+
self.assertEqual(
2727
escape_filter_chars(r'foobar'),
2828
'foobar'
2929
)
30-
self.assertEquals(
30+
self.assertEqual(
3131
escape_filter_chars(r'foo\bar'),
3232
r'foo\5cbar'
3333
)
34-
self.assertEquals(
34+
self.assertEqual(
3535
escape_filter_chars(
3636
r'foo\bar',
3737
escape_mode=0
@@ -43,7 +43,7 @@ def test_escape_filter_chars_mode1(self):
4343
"""
4444
test function escape_filter_chars() with escape_mode=1
4545
"""
46-
self.assertEquals(
46+
self.assertEqual(
4747
escape_filter_chars(
4848
'\xc3\xa4\xc3\xb6\xc3\xbc\xc3\x84\xc3\x96\xc3\x9c\xc3\x9f',
4949
escape_mode=1
@@ -55,7 +55,7 @@ def test_escape_filter_chars_mode2(self):
5555
"""
5656
test function escape_filter_chars() with escape_mode=2
5757
"""
58-
self.assertEquals(
58+
self.assertEqual(
5959
escape_filter_chars(
6060
'foobar',
6161
escape_mode=2

‎Tests/t_ldap_functions.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
See https://www.python-ldap.org/ for details.
66
7-
$Id: t_ldap_functions.py,v 1.3 2017/08/15 16:21:59 stroeder Exp $
7+
$Id: t_ldap_functions.py,v 1.4 2017/09/04 07:47:29 stroeder Exp $
88
"""
99

1010
# from Python's standard lib
@@ -25,45 +25,45 @@ def test_ldap_strf_secs(self):
2525
"""
2626
test function ldap_strf_secs()
2727
"""
28-
self.assertEquals(ldap.strf_secs(0), '19700101000000Z')
29-
self.assertEquals(ldap.strf_secs(1466947067), '20160626131747Z')
28+
self.assertEqual(ldap.strf_secs(0), '19700101000000Z')
29+
self.assertEqual(ldap.strf_secs(1466947067), '20160626131747Z')
3030

3131
def test_ldap_strp_secs(self):
3232
"""
3333
test function ldap_strp_secs()
3434
"""
35-
self.assertEquals(ldap.strp_secs('19700101000000Z'), 0)
36-
self.assertEquals(ldap.strp_secs('20160626131747Z'), 1466947067)
35+
self.assertEqual(ldap.strp_secs('19700101000000Z'), 0)
36+
self.assertEqual(ldap.strp_secs('20160626131747Z'), 1466947067)
3737

3838
def test_escape_str(self):
3939
"""
4040
test function escape_string_tmpl()
4141
"""
42-
self.assertEquals(
42+
self.assertEqual(
4343
ldap.escape_str(
4444
escape_filter_chars,
4545
'(&(objectClass=aeUser)(uid=%s))',
4646
'foo'
4747
),
4848
'(&(objectClass=aeUser)(uid=foo))'
4949
)
50-
self.assertEquals(
50+
self.assertEqual(
5151
ldap.escape_str(
5252
escape_filter_chars,
5353
'(&(objectClass=aeUser)(uid=%s))',
5454
'foo)bar'
5555
),
5656
'(&(objectClass=aeUser)(uid=foo\\29bar))'
5757
)
58-
self.assertEquals(
58+
self.assertEqual(
5959
ldap.escape_str(
6060
escape_dn_chars,
6161
'uid=%s',
6262
'foo=bar'
6363
),
6464
'uid=foo\\=bar'
6565
)
66-
self.assertEquals(
66+
self.assertEqual(
6767
ldap.escape_str(
6868
escape_dn_chars,
6969
'uid=%s,cn=%s,cn=%s,dc=example,dc=com',

‎Tests/t_ldapobject.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
55
See https://www.python-ldap.org/ for details.
66
7-
$Id: t_ldapobject.py,v 1.8 2017/08/15 16:21:59 stroeder Exp $
7+
$Id: t_ldapobject.py,v 1.9 2017/09/04 07:47:29 stroeder Exp $
88
"""
99

1010
import os
@@ -88,7 +88,7 @@ def test_search_subtree(self):
8888
attrlist=['*'],
8989
)
9090
result.sort()
91-
self.assertEquals(
91+
self.assertEqual(
9292
result,
9393
[
9494
(
@@ -118,7 +118,7 @@ def test_search_onelevel(self):
118118
['*'],
119119
)
120120
result.sort()
121-
self.assertEquals(
121+
self.assertEqual(
122122
result,
123123
[
124124
(
@@ -144,7 +144,7 @@ def test_search_oneattr(self):
144144
['cn'],
145145
)
146146
result.sort()
147-
self.assertEquals(
147+
self.assertEqual(
148148
result,
149149
[('cn=Foo4,ou=Container,'+self.server.suffix, {'cn': ['Foo4']})]
150150
)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy