Skip to content

Commit 6bd946d

Browse files
ezio-melottiezio-melotti
committed
Fix idioms and a couple of py3k warnings. Patch by Florent Xicluna.
1 parent 00afd76 commit 6bd946d

10 files changed

Lines changed: 45 additions & 51 deletions

File tree

‎Lib/bsddb/dbshelve.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ def __delitem__(self, key):
157157

158158

159159
def keys(self, txn=None):
160-
if txn != None:
160+
if txn is not None:
161161
return self.db.keys(txn)
162162
else:
163163
return self.db.keys()
@@ -185,7 +185,7 @@ def __repr__(self):
185185

186186

187187
def items(self, txn=None):
188-
if txn != None:
188+
if txn is not None:
189189
items = self.db.items(txn)
190190
else:
191191
items = self.db.items()
@@ -196,7 +196,7 @@ def items(self, txn=None):
196196
return newitems
197197

198198
def values(self, txn=None):
199-
if txn != None:
199+
if txn is not None:
200200
values = self.db.values(txn)
201201
else:
202202
values = self.db.values()

‎Lib/bsddb/dbtables.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,14 @@ def close(self) :
179179

180180
def set_range(self, search) :
181181
v = self._dbcursor.set_range(bytes(search, "iso8859-1"))
182-
if v != None :
182+
if v is not None :
183183
v = (v[0].decode("iso8859-1"),
184184
v[1].decode("iso8859-1"))
185185
return v
186186

187187
def __next__(self) :
188188
v = getattr(self._dbcursor, "next")()
189-
if v != None :
189+
if v is not None :
190190
v = (v[0].decode("iso8859-1"),
191191
v[1].decode("iso8859-1"))
192192
return v
@@ -204,7 +204,7 @@ def has_key(self, key, txn=None) :
204204

205205
def put(self, key, value, flags=0, txn=None) :
206206
key = bytes(key, "iso8859-1")
207-
if value != None :
207+
if value is not None :
208208
value = bytes(value, "iso8859-1")
209209
return self._db.put(key, value, flags=flags, txn=txn)
210210

@@ -215,7 +215,7 @@ def put_bytes(self, key, value, txn=None) :
215215
def get(self, key, txn=None, flags=0) :
216216
key = bytes(key, "iso8859-1")
217217
v = self._db.get(key, txn=txn, flags=flags)
218-
if v != None :
218+
if v is not None :
219219
v = v.decode("iso8859-1")
220220
return v
221221

@@ -540,7 +540,7 @@ def Modify(self, table, conditions={}, mappings={}):
540540
# error
541541
dataitem = None
542542
dataitem = mappings[column](dataitem)
543-
if dataitem != None:
543+
if dataitem is not None:
544544
self.db.put(
545545
_data_key(table, column, rowid),
546546
dataitem, txn=txn)

‎Lib/bsddb/test/test_all.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def __getattr__(self, v) :
2323
return getattr(self._dbcursor, v)
2424

2525
def _fix(self, v) :
26-
if v == None : return None
26+
if v is None : return None
2727
key, value = v
2828
if isinstance(key, bytes) :
2929
key = key.decode(charset)
@@ -90,7 +90,7 @@ def first(self) :
9090
def pget(self, key=None, data=None, flags=0) :
9191
# Incorrect because key can be a bare number,
9292
# but enough to pass testsuite
93-
if isinstance(key, int) and (data==None) and (flags==0) :
93+
if isinstance(key, int) and (data is None) and (flags == 0) :
9494
flags = key
9595
key = None
9696
if isinstance(key, str) :
@@ -101,7 +101,7 @@ def pget(self, key=None, data=None, flags=0) :
101101
if isinstance(data, str) :
102102
data = bytes(data, charset)
103103
v=self._dbcursor.pget(key=key, data=data, flags=flags)
104-
if v != None :
104+
if v is not None :
105105
v1, v2, v3 = v
106106
if isinstance(v1, bytes) :
107107
v1 = v1.decode(charset)
@@ -114,7 +114,7 @@ def pget(self, key=None, data=None, flags=0) :
114114

115115
def join_item(self) :
116116
v = self._dbcursor.join_item()
117-
if v != None :
117+
if v is not None :
118118
v = v.decode(charset)
119119
return v
120120

@@ -134,7 +134,7 @@ def get(self, *args, **kwargs) :
134134
args =(k, d, f)
135135

136136
v = self._dbcursor.get(*args, **kwargs)
137-
if v != None :
137+
if v is not None :
138138
k, v = v
139139
if isinstance(k, bytes) :
140140
k = k.decode(charset)
@@ -176,7 +176,7 @@ def __getitem__(self, k) :
176176
if isinstance(k, str) :
177177
k = bytes(k, charset)
178178
v = self._db[k]
179-
if v != None :
179+
if v is not None :
180180
v = v.decode(charset)
181181
return v
182182

@@ -230,15 +230,15 @@ def get(self, key, default="MagicCookie", txn=None, flags=0, dlen=-1, doff=-1) :
230230
else :
231231
v=self._db.get(key, txn=txn, flags=flags,
232232
dlen=dlen, doff=doff)
233-
if (v != None) and isinstance(v, bytes) :
233+
if (v is not None) and isinstance(v, bytes) :
234234
v = v.decode(charset)
235235
return v
236236

237237
def pget(self, key, txn=None) :
238238
if isinstance(key, str) :
239239
key = bytes(key, charset)
240240
v=self._db.pget(key, txn=txn)
241-
if v != None :
241+
if v is not None :
242242
v1, v2 = v
243243
if isinstance(v1, bytes) :
244244
v1 = v1.decode(charset)
@@ -252,7 +252,7 @@ def get_both(self, key, value, txn=None, flags=0) :
252252
if isinstance(value, str) :
253253
value = bytes(value, charset)
254254
v=self._db.get_both(key, value, txn=txn, flags=flags)
255-
if v != None :
255+
if v is not None :
256256
v = v.decode(charset)
257257
return v
258258

‎Lib/bsddb/test/test_basics.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
342342
else:
343343
if set_raises_error:
344344
self.fail("expected exception")
345-
if n != None:
345+
if n is not None:
346346
self.fail("expected None: %r" % (n,))
347347

348348
rec = c.get_both('0404', self.makeData('0404'))
@@ -356,7 +356,7 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
356356
else:
357357
if get_raises_error:
358358
self.fail("expected exception")
359-
if n != None:
359+
if n is not None:
360360
self.fail("expected None: %r" % (n,))
361361

362362
if self.d.get_type() == db.DB_BTREE:

‎Lib/bsddb/test/test_compare.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,12 +238,7 @@ def my_compare (a, b):
238238

239239
self.startTest ()
240240
self.createDB (my_compare)
241-
try:
242-
self.db.set_bt_compare (my_compare)
243-
self.assert_(0, "this set should fail")
244-
245-
except RuntimeError, msg:
246-
pass
241+
self.assertRaises (RuntimeError, self.db.set_bt_compare, my_compare)
247242

248243
def test_suite ():
249244
res = unittest.TestSuite ()

‎Lib/bsddb/test/test_dbtables.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def test_Modify(self):
341341
self.tdb.Insert(tabname, {'Type': 'Unknown', 'Access': '0'})
342342

343343
def set_type(type):
344-
if type == None:
344+
if type is None:
345345
return 'MP3'
346346
return type
347347

‎Lib/bsddb/test/test_recno.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def test01_basic(self):
3838

3939
for x in letters:
4040
recno = d.append(x * 60)
41-
self.assertEqual(type(recno), type(0))
42-
self.assert_(recno >= 1)
41+
self.assertIsInstance(recno, int)
42+
self.assertGreaterEqual(recno, 1)
4343
if verbose:
4444
print recno,
4545

@@ -54,7 +54,7 @@ def test01_basic(self):
5454
if verbose:
5555
print data
5656

57-
self.assertEqual(type(data), type(""))
57+
self.assertIsInstance(data, str)
5858
self.assertEqual(data, d.get(recno))
5959

6060
try:
@@ -91,21 +91,21 @@ def test01_basic(self):
9191
keys = d.keys()
9292
if verbose:
9393
print keys
94-
self.assertEqual(type(keys), type([]))
95-
self.assertEqual(type(keys[0]), type(123))
94+
self.assertIsInstance(keys, list)
95+
self.assertIsInstance(keys[0], int)
9696
self.assertEqual(len(keys), len(d))
9797

9898
items = d.items()
9999
if verbose:
100100
pprint(items)
101-
self.assertEqual(type(items), type([]))
102-
self.assertEqual(type(items[0]), type(()))
101+
self.assertIsInstance(items, list)
102+
self.assertIsInstance(items[0], tuple)
103103
self.assertEqual(len(items[0]), 2)
104-
self.assertEqual(type(items[0][0]), type(123))
105-
self.assertEqual(type(items[0][1]), type(""))
104+
self.assertIsInstance(items[0][0], int)
105+
self.assertIsInstance(items[0][1], str)
106106
self.assertEqual(len(items), len(d))
107107

108-
self.assert_(d.has_key(25))
108+
self.assertTrue(d.has_key(25))
109109

110110
del d[25]
111111
self.assertFalse(d.has_key(25))
@@ -177,7 +177,7 @@ def test01_basic(self):
177177
if get_returns_none:
178178
self.fail("unexpected DBKeyEmptyError exception")
179179
else:
180-
self.assertEqual(val[0], db.DB_KEYEMPTY)
180+
self.assertEqual(val.args[0], db.DB_KEYEMPTY)
181181
if verbose: print val
182182
else:
183183
if not get_returns_none:

‎Lib/bsddb/test/test_replication.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,11 @@ def test01_basic_replication(self) :
188188
import time
189189
timeout=time.time()+10
190190
v=None
191-
while (time.time()<timeout) and (v==None) :
191+
while (time.time()<timeout) and (v is None) :
192192
txn=self.dbenvClient.txn_begin()
193193
v=self.dbClient.get("ABC", txn=txn)
194194
txn.commit()
195-
if v==None :
195+
if v is None :
196196
time.sleep(0.02)
197197
self.assertTrue(time.time()<timeout)
198198
self.assertEquals("123", v)
@@ -201,11 +201,11 @@ def test01_basic_replication(self) :
201201
self.dbMaster.delete("ABC", txn=txn)
202202
txn.commit()
203203
timeout=time.time()+10
204-
while (time.time()<timeout) and (v!=None) :
204+
while (time.time()<timeout) and (v is not None) :
205205
txn=self.dbenvClient.txn_begin()
206206
v=self.dbClient.get("ABC", txn=txn)
207207
txn.commit()
208-
if v==None :
208+
if v is None :
209209
time.sleep(0.02)
210210
self.assertTrue(time.time()<timeout)
211211
self.assertEquals(None, v)
@@ -298,7 +298,7 @@ def basic_rep_threading(self) :
298298
def thread_do(env, q, envid, election_status, must_be_master) :
299299
while True :
300300
v=q.get()
301-
if v == None : return
301+
if v is None : return
302302
env.rep_process_message(v[0], v[1], envid)
303303

304304
self.thread_do = thread_do
@@ -351,11 +351,11 @@ def test01_basic_replication(self) :
351351
import time
352352
timeout=time.time()+10
353353
v=None
354-
while (time.time()<timeout) and (v==None) :
354+
while (time.time()<timeout) and (v is None) :
355355
txn=self.dbenvClient.txn_begin()
356356
v=self.dbClient.get("ABC", txn=txn)
357357
txn.commit()
358-
if v==None :
358+
if v is None :
359359
time.sleep(0.02)
360360
self.assertTrue(time.time()<timeout)
361361
self.assertEquals("123", v)
@@ -364,11 +364,11 @@ def test01_basic_replication(self) :
364364
self.dbMaster.delete("ABC", txn=txn)
365365
txn.commit()
366366
timeout=time.time()+10
367-
while (time.time()<timeout) and (v!=None) :
367+
while (time.time()<timeout) and (v is not None) :
368368
txn=self.dbenvClient.txn_begin()
369369
v=self.dbClient.get("ABC", txn=txn)
370370
txn.commit()
371-
if v==None :
371+
if v is None :
372372
time.sleep(0.02)
373373
self.assertTrue(time.time()<timeout)
374374
self.assertEquals(None, v)
@@ -391,7 +391,7 @@ def test03_master_election(self) :
391391
def thread_do(env, q, envid, election_status, must_be_master) :
392392
while True :
393393
v=q.get()
394-
if v == None : return
394+
if v is None : return
395395
r = env.rep_process_message(v[0],v[1],envid)
396396
if must_be_master and self.confirmed_master :
397397
self.dbenvMaster.rep_start(flags = db.DB_REP_MASTER)

‎Lib/bsddb/test/test_thread.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def writerThread(self, d, keys, readers):
424424
readers.pop().start()
425425
except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val:
426426
if verbose:
427-
print "%s: Aborting transaction (%s)" % (name, val[1])
427+
print "%s: Aborting transaction (%s)" % (name, val.args[1])
428428
txn.abort()
429429

430430
if verbose:
@@ -455,7 +455,7 @@ def readerThread(self, d, readerNum):
455455
finished = True
456456
except (db.DBLockDeadlockError, db.DBLockNotGrantedError), val:
457457
if verbose:
458-
print "%s: Aborting transaction (%s)" % (name, val[1])
458+
print "%s: Aborting transaction (%s)" % (name, val.args[1])
459459
c.close()
460460
txn.abort()
461461

‎Lib/test/test_bsddb3.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
import tempfile
88
import time
99
import unittest
10-
from test.test_support import (requires, verbose, run_unittest, unlink, rmtree,
11-
import_module)
10+
from test.test_support import requires, run_unittest, import_module
1211

1312
# Skip test if _bsddb module was not built.
1413
import_module('_bsddb')

0 commit comments

Comments
 (0)