Skip to content

Commit 68a6db6

Browse files
jdufresneencukou
jdufresne
authored and
encukou
committed
Use builtin unittest methods assertIsNone & assertIsNotNone
These methods were introduced in Python 2.7 and 3.1. Available in all supported environments. Can remove the local reimplementation. https://docs.python.org/3/library/unittest.html#unittest.TestCase.assertIsNone https://docs.python.org/2/library/unittest.html#unittest.TestCase.assertIsNone
1 parent 5faff53 commit 68a6db6

File tree

4 files changed

+80
-90
lines changed

4 files changed

+80
-90
lines changed

‎Tests/t_cext.py

Lines changed: 63 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ def _open_conn(self, bind=True):
9999
self.assertEqual(type(msgid), type(0))
100100
return l
101101

102-
def assertNotNone(self, expr, msg=None):
103-
self.assertFalse(expr is None, msg or repr(expr))
104-
105-
def assertNone(self, expr, msg=None):
106-
self.assertFalse(expr is not None, msg or repr(expr))
107-
108102
# Test for the existence of a whole bunch of constants
109103
# that the C module is supposed to export
110104
def test_constants(self):
@@ -128,88 +122,88 @@ def test_constants(self):
128122
self.assertEqual(_ldap.RES_SEARCH_REFERENCE, 0x73) # v3
129123
self.assertEqual(_ldap.RES_EXTENDED, 0x78) # v3
130124
#self.assertEqual(_ldap.RES_INTERMEDIATE, 0x79) # v3
131-
self.assertNotNone(_ldap.RES_ANY)
132-
self.assertNotNone(_ldap.RES_UNSOLICITED)
125+
self.assertIsNotNone(_ldap.RES_ANY)
126+
self.assertIsNotNone(_ldap.RES_UNSOLICITED)
133127

134-
self.assertNotNone(_ldap.AUTH_NONE)
135-
self.assertNotNone(_ldap.AUTH_SIMPLE)
128+
self.assertIsNotNone(_ldap.AUTH_NONE)
129+
self.assertIsNotNone(_ldap.AUTH_SIMPLE)
136130

137-
self.assertNotNone(_ldap.SCOPE_BASE)
138-
self.assertNotNone(_ldap.SCOPE_ONELEVEL)
139-
self.assertNotNone(_ldap.SCOPE_SUBTREE)
131+
self.assertIsNotNone(_ldap.SCOPE_BASE)
132+
self.assertIsNotNone(_ldap.SCOPE_ONELEVEL)
133+
self.assertIsNotNone(_ldap.SCOPE_SUBTREE)
140134

141-
self.assertNotNone(_ldap.MOD_ADD)
142-
self.assertNotNone(_ldap.MOD_DELETE)
143-
self.assertNotNone(_ldap.MOD_REPLACE)
144-
self.assertNotNone(_ldap.MOD_INCREMENT)
145-
self.assertNotNone(_ldap.MOD_BVALUES)
135+
self.assertIsNotNone(_ldap.MOD_ADD)
136+
self.assertIsNotNone(_ldap.MOD_DELETE)
137+
self.assertIsNotNone(_ldap.MOD_REPLACE)
138+
self.assertIsNotNone(_ldap.MOD_INCREMENT)
139+
self.assertIsNotNone(_ldap.MOD_BVALUES)
146140

147141
# for result4()
148-
self.assertNotNone(_ldap.MSG_ONE)
149-
self.assertNotNone(_ldap.MSG_ALL)
150-
self.assertNotNone(_ldap.MSG_RECEIVED)
142+
self.assertIsNotNone(_ldap.MSG_ONE)
143+
self.assertIsNotNone(_ldap.MSG_ALL)
144+
self.assertIsNotNone(_ldap.MSG_RECEIVED)
151145

152146
# for OPT_DEFEF
153-
self.assertNotNone(_ldap.DEREF_NEVER)
154-
self.assertNotNone(_ldap.DEREF_SEARCHING)
155-
self.assertNotNone(_ldap.DEREF_FINDING)
156-
self.assertNotNone(_ldap.DEREF_ALWAYS)
147+
self.assertIsNotNone(_ldap.DEREF_NEVER)
148+
self.assertIsNotNone(_ldap.DEREF_SEARCHING)
149+
self.assertIsNotNone(_ldap.DEREF_FINDING)
150+
self.assertIsNotNone(_ldap.DEREF_ALWAYS)
157151

158152
# for OPT_SIZELIMIT, OPT_TIMELIMIT
159-
self.assertNotNone(_ldap.NO_LIMIT)
153+
self.assertIsNotNone(_ldap.NO_LIMIT)
160154

161155
# standard options
162-
self.assertNotNone(_ldap.OPT_API_INFO)
163-
self.assertNotNone(_ldap.OPT_DEREF)
164-
self.assertNotNone(_ldap.OPT_SIZELIMIT)
165-
self.assertNotNone(_ldap.OPT_TIMELIMIT)
166-
self.assertNotNone(_ldap.OPT_REFERRALS)
167-
self.assertNotNone(_ldap.OPT_RESTART)
168-
self.assertNotNone(_ldap.OPT_PROTOCOL_VERSION)
169-
self.assertNotNone(_ldap.OPT_SERVER_CONTROLS)
170-
self.assertNotNone(_ldap.OPT_CLIENT_CONTROLS)
171-
self.assertNotNone(_ldap.OPT_API_FEATURE_INFO)
172-
self.assertNotNone(_ldap.OPT_HOST_NAME)
173-
self.assertNotNone(_ldap.OPT_ERROR_NUMBER) # = OPT_RESULT_CODE
174-
self.assertNotNone(_ldap.OPT_ERROR_STRING) # = OPT_DIAGNOSITIC_MESSAGE
175-
self.assertNotNone(_ldap.OPT_MATCHED_DN)
156+
self.assertIsNotNone(_ldap.OPT_API_INFO)
157+
self.assertIsNotNone(_ldap.OPT_DEREF)
158+
self.assertIsNotNone(_ldap.OPT_SIZELIMIT)
159+
self.assertIsNotNone(_ldap.OPT_TIMELIMIT)
160+
self.assertIsNotNone(_ldap.OPT_REFERRALS)
161+
self.assertIsNotNone(_ldap.OPT_RESTART)
162+
self.assertIsNotNone(_ldap.OPT_PROTOCOL_VERSION)
163+
self.assertIsNotNone(_ldap.OPT_SERVER_CONTROLS)
164+
self.assertIsNotNone(_ldap.OPT_CLIENT_CONTROLS)
165+
self.assertIsNotNone(_ldap.OPT_API_FEATURE_INFO)
166+
self.assertIsNotNone(_ldap.OPT_HOST_NAME)
167+
self.assertIsNotNone(_ldap.OPT_ERROR_NUMBER) # = OPT_RESULT_CODE
168+
self.assertIsNotNone(_ldap.OPT_ERROR_STRING) # = OPT_DIAGNOSITIC_MESSAGE
169+
self.assertIsNotNone(_ldap.OPT_MATCHED_DN)
176170

177171
# OpenLDAP specific
178-
self.assertNotNone(_ldap.OPT_DEBUG_LEVEL)
179-
self.assertNotNone(_ldap.OPT_TIMEOUT)
180-
self.assertNotNone(_ldap.OPT_REFHOPLIMIT)
181-
self.assertNotNone(_ldap.OPT_NETWORK_TIMEOUT)
182-
self.assertNotNone(_ldap.OPT_URI)
183-
#self.assertNotNone(_ldap.OPT_REFERRAL_URLS)
184-
#self.assertNotNone(_ldap.OPT_SOCKBUF)
185-
#self.assertNotNone(_ldap.OPT_DEFBASE)
186-
#self.assertNotNone(_ldap.OPT_CONNECT_ASYNC)
172+
self.assertIsNotNone(_ldap.OPT_DEBUG_LEVEL)
173+
self.assertIsNotNone(_ldap.OPT_TIMEOUT)
174+
self.assertIsNotNone(_ldap.OPT_REFHOPLIMIT)
175+
self.assertIsNotNone(_ldap.OPT_NETWORK_TIMEOUT)
176+
self.assertIsNotNone(_ldap.OPT_URI)
177+
#self.assertIsNotNone(_ldap.OPT_REFERRAL_URLS)
178+
#self.assertIsNotNone(_ldap.OPT_SOCKBUF)
179+
#self.assertIsNotNone(_ldap.OPT_DEFBASE)
180+
#self.assertIsNotNone(_ldap.OPT_CONNECT_ASYNC)
187181

188182
# str2dn()
189-
self.assertNotNone(_ldap.DN_FORMAT_LDAP)
190-
self.assertNotNone(_ldap.DN_FORMAT_LDAPV3)
191-
self.assertNotNone(_ldap.DN_FORMAT_LDAPV2)
192-
self.assertNotNone(_ldap.DN_FORMAT_DCE)
193-
self.assertNotNone(_ldap.DN_FORMAT_UFN)
194-
self.assertNotNone(_ldap.DN_FORMAT_AD_CANONICAL)
195-
self.assertNotNone(_ldap.DN_FORMAT_MASK)
196-
self.assertNotNone(_ldap.DN_PRETTY)
197-
self.assertNotNone(_ldap.DN_SKIP)
198-
self.assertNotNone(_ldap.DN_P_NOLEADTRAILSPACES)
199-
self.assertNotNone(_ldap.DN_P_NOSPACEAFTERRDN)
200-
self.assertNotNone(_ldap.DN_PEDANTIC)
201-
self.assertNotNone(_ldap.AVA_NULL)
202-
self.assertNotNone(_ldap.AVA_STRING)
203-
self.assertNotNone(_ldap.AVA_BINARY)
204-
self.assertNotNone(_ldap.AVA_NONPRINTABLE)
183+
self.assertIsNotNone(_ldap.DN_FORMAT_LDAP)
184+
self.assertIsNotNone(_ldap.DN_FORMAT_LDAPV3)
185+
self.assertIsNotNone(_ldap.DN_FORMAT_LDAPV2)
186+
self.assertIsNotNone(_ldap.DN_FORMAT_DCE)
187+
self.assertIsNotNone(_ldap.DN_FORMAT_UFN)
188+
self.assertIsNotNone(_ldap.DN_FORMAT_AD_CANONICAL)
189+
self.assertIsNotNone(_ldap.DN_FORMAT_MASK)
190+
self.assertIsNotNone(_ldap.DN_PRETTY)
191+
self.assertIsNotNone(_ldap.DN_SKIP)
192+
self.assertIsNotNone(_ldap.DN_P_NOLEADTRAILSPACES)
193+
self.assertIsNotNone(_ldap.DN_P_NOSPACEAFTERRDN)
194+
self.assertIsNotNone(_ldap.DN_PEDANTIC)
195+
self.assertIsNotNone(_ldap.AVA_NULL)
196+
self.assertIsNotNone(_ldap.AVA_STRING)
197+
self.assertIsNotNone(_ldap.AVA_BINARY)
198+
self.assertIsNotNone(_ldap.AVA_NONPRINTABLE)
205199

206200
# these two constants are pointless? XXX
207201
self.assertEqual(_ldap.OPT_ON, 1)
208202
self.assertEqual(_ldap.OPT_OFF, 0)
209203

210204
# these constants useless after ldap_url_parse() was dropped XXX
211-
self.assertNotNone(_ldap.URL_ERR_BADSCOPE)
212-
self.assertNotNone(_ldap.URL_ERR_MEM)
205+
self.assertIsNotNone(_ldap.URL_ERR_BADSCOPE)
206+
self.assertIsNotNone(_ldap.URL_ERR_MEM)
213207

214208
def test_test_flags(self):
215209
# test flag, see slapdtest and tox.ini
@@ -263,7 +257,7 @@ def test_anon_rootdse_search(self):
263257
def test_unbind(self):
264258
l = self._open_conn()
265259
m = l.unbind_ext()
266-
self.assertNone(m)
260+
self.assertIsNone(m)
267261
# Second attempt to unbind should yield an exception
268262
try:
269263
l.unbind_ext()
@@ -301,7 +295,7 @@ def test_abandon(self):
301295
l = self._open_conn()
302296
m = l.search_ext(self.server.suffix, _ldap.SCOPE_SUBTREE, '(objectClass=*)')
303297
ret = l.abandon_ext(m)
304-
self.assertNone(ret)
298+
self.assertIsNone(ret)
305299
try:
306300
r = l.result4(m, _ldap.MSG_ALL, 0.3) # (timeout /could/ be longer)
307301
except _ldap.TIMEOUT as e:

‎Tests/t_cidict.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def test_cidict(self):
3030
cix = ldap.cidict.cidict(data)
3131
self.assertEqual(cix["ABCDEF"], 123)
3232
self.assertEqual(cix.get("ABCDEF", None), 123)
33-
self.assertEqual(cix.get("not existent", None), None)
33+
self.assertIsNone(cix.get("not existent", None))
3434
cix["xYZ"] = 987
3535
self.assertEqual(cix["XyZ"], 987)
3636
self.assertEqual(cix.get("xyz", None), 987)

‎Tests/t_ldap_options.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ def _test_timeout(self, option):
7171
old = self.get_option(option)
7272
try:
7373
self.set_option(option, None)
74-
self.assertEqual(self.get_option(option), None)
74+
self.assertIsNone(self.get_option(option))
7575
self.set_option(option, -1)
76-
self.assertEqual(self.get_option(option), None)
76+
self.assertIsNone(self.get_option(option))
7777
finally:
7878
self.set_option(option, old)
7979

@@ -168,16 +168,16 @@ def test_network_timeout_attribute(self):
168168
self.assertEqual(self.get_option(option), 5)
169169

170170
self.conn.network_timeout = -1
171-
self.assertEqual(self.conn.network_timeout, None)
172-
self.assertEqual(self.get_option(option), None)
171+
self.assertIsNone(self.conn.network_timeout)
172+
self.assertIsNone(self.get_option(option))
173173

174174
self.conn.network_timeout = 10.5
175175
self.assertEqual(self.conn.network_timeout, 10.5)
176176
self.assertEqual(self.get_option(option), 10.5)
177177

178178
self.conn.network_timeout = None
179-
self.assertEqual(self.conn.network_timeout, None)
180-
self.assertEqual(self.get_option(option), None)
179+
self.assertIsNone(self.conn.network_timeout)
180+
self.assertIsNone(self.get_option(option))
181181
finally:
182182
self.set_option(option, old)
183183

‎Tests/t_ldapurl.py

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@ def test_ldapurl(self):
183183

184184

185185
class TestLDAPUrl(unittest.TestCase):
186-
187-
def assertNone(self, expr, msg=None):
188-
self.assertFalse(expr is not None, msg or ("%r" % expr))
189-
190186
def test_combo(self):
191187
u = MyLDAPUrl(
192188
"ldap://127.0.0.1:1234/dc=example,dc=com"
@@ -223,15 +219,15 @@ def test_parse_empty_dn(self):
223219

224220
def test_parse_default_attrs(self):
225221
u = LDAPUrl("ldap://")
226-
self.assertNone(u.attrs)
222+
self.assertIsNone(u.attrs)
227223

228224
def test_parse_default_scope(self):
229225
u = LDAPUrl("ldap://")
230-
self.assertNone(u.scope) # RFC4516 s3
226+
self.assertIsNone(u.scope) # RFC4516 s3
231227

232228
def test_parse_default_filter(self):
233229
u = LDAPUrl("ldap://")
234-
self.assertNone(u.filterstr) # RFC4516 s3
230+
self.assertIsNone(u.filterstr) # RFC4516 s3
235231

236232
def test_parse_default_extensions(self):
237233
u = LDAPUrl("ldap://")
@@ -285,9 +281,9 @@ def test_parse_dn(self):
285281

286282
def test_parse_attrs(self):
287283
u = LDAPUrl("ldap:///?")
288-
self.assertEqual(u.attrs, None)
284+
self.assertIsNone(u.attrs)
289285
u = LDAPUrl("ldap:///??")
290-
self.assertEqual(u.attrs, None)
286+
self.assertIsNone(u.attrs)
291287
u = LDAPUrl("ldap:///?*?")
292288
self.assertEqual(u.attrs, ['*'])
293289
u = LDAPUrl("ldap:///?*,*?")
@@ -303,9 +299,9 @@ def test_parse_attrs(self):
303299

304300
def test_parse_scope_default(self):
305301
u = LDAPUrl("ldap:///??")
306-
self.assertNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
302+
self.assertIsNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
307303
u = LDAPUrl("ldap:///???")
308-
self.assertNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
304+
self.assertIsNone(u.scope) # on opposite to RFC4516 s3 for referral chasing
309305

310306
def test_parse_scope(self):
311307
u = LDAPUrl("ldap:///??sub")
@@ -355,8 +351,8 @@ def test_parse_filter(self):
355351

356352
def test_parse_extensions(self):
357353
u = LDAPUrl("ldap:///????")
358-
self.assertNone(u.extensions)
359-
self.assertNone(u.who)
354+
self.assertIsNone(u.extensions)
355+
self.assertIsNone(u.who)
360356
u = LDAPUrl("ldap:///????bindname=cn=root")
361357
self.assertEqual(len(u.extensions), 1)
362358
self.assertEqual(u.who, "cn=root")
@@ -380,7 +376,7 @@ def test_parse_extensions_5questions(self):
380376
def test_parse_extensions_novalue(self):
381377
u = LDAPUrl("ldap:///????bindname")
382378
self.assertEqual(len(u.extensions), 1)
383-
self.assertNone(u.who)
379+
self.assertIsNone(u.who)
384380

385381
@unittest.expectedFailure
386382
def test_bad_urls(self):

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