Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 95a2a4e

Browse files
anthonybaxteranthonybaxter
committed
Tools/scripts/reindent.py _is_ your friend
1 parent 684364c commit 95a2a4e

5 files changed

Lines changed: 119 additions & 119 deletions

File tree

‎Lib/bsddb/test/test_associate.py‎

Lines changed: 60 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ def setUp(self):
9494
homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home')
9595
self.homeDir = homeDir
9696
try:
97-
os.mkdir(homeDir)
97+
os.mkdir(homeDir)
9898
except os.error:
99-
import glob
100-
files = glob.glob(os.path.join(self.homeDir, '*'))
101-
for file in files:
102-
os.remove(file)
99+
import glob
100+
files = glob.glob(os.path.join(self.homeDir, '*'))
101+
for file in files:
102+
os.remove(file)
103103
self.env = db.DBEnv()
104104
self.env.open(homeDir, db.DB_CREATE | db.DB_INIT_MPOOL)
105105

@@ -126,17 +126,17 @@ def test00_associateDBError(self):
126126

127127
# dupDB has been configured to allow duplicates, it can't
128128
# associate with a secondary. BerkeleyDB will return an error.
129-
try:
130-
def f(a,b): return a+b
131-
dupDB.associate(secDB, f)
132-
except db.DBError:
133-
# good
134-
secDB.close()
135-
dupDB.close()
136-
else:
137-
secDB.close()
138-
dupDB.close()
139-
self.fail("DBError exception was expected")
129+
try:
130+
def f(a,b): return a+b
131+
dupDB.associate(secDB, f)
132+
except db.DBError:
133+
# good
134+
secDB.close()
135+
dupDB.close()
136+
else:
137+
secDB.close()
138+
dupDB.close()
139+
self.fail("DBError exception was expected")
140140

141141

142142

@@ -153,12 +153,12 @@ def setUp(self):
153153
homeDir = os.path.join(os.path.dirname(sys.argv[0]), 'db_home')
154154
self.homeDir = homeDir
155155
try:
156-
os.mkdir(homeDir)
156+
os.mkdir(homeDir)
157157
except os.error:
158-
import glob
159-
files = glob.glob(os.path.join(self.homeDir, '*'))
160-
for file in files:
161-
os.remove(file)
158+
import glob
159+
files = glob.glob(os.path.join(self.homeDir, '*'))
160+
for file in files:
161+
os.remove(file)
162162
self.env = db.DBEnv()
163163
self.env.open(homeDir, db.DB_CREATE | db.DB_INIT_MPOOL |
164164
db.DB_INIT_LOCK | db.DB_THREAD | self.envFlags)
@@ -178,22 +178,22 @@ def addDataToDB(self, d, txn=None):
178178
d.put(key, string.join(value, '|'), txn=txn)
179179

180180
def createDB(self, txn=None):
181-
self.cur = None
182-
self.secDB = None
181+
self.cur = None
182+
self.secDB = None
183183
self.primary = db.DB(self.env)
184184
self.primary.set_get_returns_none(2)
185-
if db.version() >= (4, 1):
186-
self.primary.open(self.filename, "primary", self.dbtype,
185+
if db.version() >= (4, 1):
186+
self.primary.open(self.filename, "primary", self.dbtype,
187187
db.DB_CREATE | db.DB_THREAD | self.dbFlags, txn=txn)
188-
else:
189-
self.primary.open(self.filename, "primary", self.dbtype,
188+
else:
189+
self.primary.open(self.filename, "primary", self.dbtype,
190190
db.DB_CREATE | db.DB_THREAD | self.dbFlags)
191191

192192
def closeDB(self):
193-
if self.cur:
194-
self.cur.close()
195-
if self.secDB:
196-
self.secDB.close()
193+
if self.cur:
194+
self.cur.close()
195+
if self.secDB:
196+
self.secDB.close()
197197
self.primary.close()
198198

199199
def getDB(self):
@@ -294,7 +294,7 @@ def finish_test(self, secDB, txn=None):
294294
# all items accounted for EXCEPT for 1 with "Blues" genre
295295
assert count == len(musicdata)-1
296296

297-
self.cur = None
297+
self.cur = None
298298

299299
def getGenre(self, priKey, priData):
300300
assert type(priData) == type("")
@@ -327,41 +327,41 @@ class AssociateBTreeTxnTestCase(AssociateBTreeTestCase):
327327
dbFlags = 0
328328

329329
def txn_finish_test(self, sDB, txn):
330-
try:
331-
self.finish_test(sDB, txn=txn)
332-
finally:
333-
if self.cur:
334-
self.cur.close()
335-
self.cur = None
336-
if txn:
337-
txn.commit()
330+
try:
331+
self.finish_test(sDB, txn=txn)
332+
finally:
333+
if self.cur:
334+
self.cur.close()
335+
self.cur = None
336+
if txn:
337+
txn.commit()
338338

339339
def test13_associate_in_transaction(self):
340340
if verbose:
341341
print '\n', '-=' * 30
342342
print "Running %s.test13_associateAutoCommit..." % \
343343
self.__class__.__name__
344344

345-
txn = self.env.txn_begin()
346-
try:
347-
self.createDB(txn=txn)
348-
349-
self.secDB = db.DB(self.env)
350-
self.secDB.set_flags(db.DB_DUP)
351-
self.secDB.set_get_returns_none(2)
352-
self.secDB.open(self.filename, "secondary", db.DB_BTREE,
353-
db.DB_CREATE | db.DB_THREAD, txn=txn)
354-
if db.version() >= (4,1):
355-
self.getDB().associate(self.secDB, self.getGenre, txn=txn)
356-
else:
357-
self.getDB().associate(self.secDB, self.getGenre)
345+
txn = self.env.txn_begin()
346+
try:
347+
self.createDB(txn=txn)
348+
349+
self.secDB = db.DB(self.env)
350+
self.secDB.set_flags(db.DB_DUP)
351+
self.secDB.set_get_returns_none(2)
352+
self.secDB.open(self.filename, "secondary", db.DB_BTREE,
353+
db.DB_CREATE | db.DB_THREAD, txn=txn)
354+
if db.version() >= (4,1):
355+
self.getDB().associate(self.secDB, self.getGenre, txn=txn)
356+
else:
357+
self.getDB().associate(self.secDB, self.getGenre)
358358

359-
self.addDataToDB(self.getDB(), txn=txn)
360-
except:
361-
txn.abort()
362-
raise
359+
self.addDataToDB(self.getDB(), txn=txn)
360+
except:
361+
txn.abort()
362+
raise
363363

364-
self.txn_finish_test(self.secDB, txn=txn)
364+
self.txn_finish_test(self.secDB, txn=txn)
365365

366366

367367
#----------------------------------------------------------------------
@@ -454,8 +454,8 @@ def test_suite():
454454
suite.addTest(unittest.makeSuite(AssociateBTreeTestCase))
455455
suite.addTest(unittest.makeSuite(AssociateRecnoTestCase))
456456

457-
if db.version() >= (4, 1):
458-
suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase))
457+
if db.version() >= (4, 1):
458+
suite.addTest(unittest.makeSuite(AssociateBTreeTxnTestCase))
459459

460460
suite.addTest(unittest.makeSuite(ShelveAssociateHashTestCase))
461461
suite.addTest(unittest.makeSuite(ShelveAssociateBTreeTestCase))

‎Lib/bsddb/test/test_basics.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,14 @@ def test03_SimpleCursorStuff(self, get_raises_error=0, set_raises_error=0):
397397
try:
398398
rec = c.current()
399399
except db.DBKeyEmptyError, val:
400-
if get_raises_error:
401-
assert val[0] == db.DB_KEYEMPTY
402-
if verbose: print val
403-
else:
404-
self.fail("unexpected DBKeyEmptyError")
400+
if get_raises_error:
401+
assert val[0] == db.DB_KEYEMPTY
402+
if verbose: print val
403+
else:
404+
self.fail("unexpected DBKeyEmptyError")
405405
else:
406-
if get_raises_error:
407-
self.fail('DBKeyEmptyError exception expected')
406+
if get_raises_error:
407+
self.fail('DBKeyEmptyError exception expected')
408408

409409
c.next()
410410
c2 = c.dup(db.DB_POSITION)

‎Lib/bsddb/test/test_compare.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -164,21 +164,21 @@ def bad_comparator (l, r):
164164
self.finishTest ()
165165

166166
def verifyStderr(self, method, successRe):
167-
"""
168-
Call method() while capturing sys.stderr output internally and
169-
call self.fail() if successRe.search() does not match the stderr
170-
output. This is used to test for uncatchable exceptions.
171-
"""
172-
stdErr = sys.stderr
173-
sys.stderr = StringIO()
174-
try:
175-
method()
176-
finally:
177-
temp = sys.stderr
178-
sys.stderr = stdErr
179-
errorOut = temp.getvalue()
180-
if not successRe.search(errorOut):
181-
self.fail("unexpected stderr output:\n"+errorOut)
167+
"""
168+
Call method() while capturing sys.stderr output internally and
169+
call self.fail() if successRe.search() does not match the stderr
170+
output. This is used to test for uncatchable exceptions.
171+
"""
172+
stdErr = sys.stderr
173+
sys.stderr = StringIO()
174+
try:
175+
method()
176+
finally:
177+
temp = sys.stderr
178+
sys.stderr = stdErr
179+
errorOut = temp.getvalue()
180+
if not successRe.search(errorOut):
181+
self.fail("unexpected stderr output:\n"+errorOut)
182182

183183
def _test_compare_function_exception (self):
184184
self.startTest ()
@@ -188,15 +188,15 @@ def bad_comparator (l, r):
188188
return 0
189189
raise RuntimeError, "i'm a naughty comparison function"
190190
self.createDB (bad_comparator)
191-
#print "\n*** test should print 2 uncatchable tracebacks ***"
192-
self.addDataToDB (['a', 'b', 'c']) # this should raise, but...
193-
self.finishTest ()
191+
#print "\n*** test should print 2 uncatchable tracebacks ***"
192+
self.addDataToDB (['a', 'b', 'c']) # this should raise, but...
193+
self.finishTest ()
194194

195195
def test_compare_function_exception(self):
196-
self.verifyStderr(
197-
self._test_compare_function_exception,
198-
re.compile('(^RuntimeError:.* naughty.*){2}', re.M|re.S)
199-
)
196+
self.verifyStderr(
197+
self._test_compare_function_exception,
198+
re.compile('(^RuntimeError:.* naughty.*){2}', re.M|re.S)
199+
)
200200

201201
def _test_compare_function_bad_return (self):
202202
self.startTest ()
@@ -211,10 +211,10 @@ def bad_comparator (l, r):
211211
self.finishTest ()
212212

213213
def test_compare_function_bad_return(self):
214-
self.verifyStderr(
215-
self._test_compare_function_bad_return,
216-
re.compile('(^TypeError:.* return an int.*){2}', re.M|re.S)
217-
)
214+
self.verifyStderr(
215+
self._test_compare_function_bad_return,
216+
re.compile('(^TypeError:.* return an int.*){2}', re.M|re.S)
217+
)
218218

219219

220220
def test_cannot_assign_twice (self):

‎Lib/bsddb/test/test_recno.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ def tearDown(self):
3535
def test01_basic(self):
3636
d = db.DB()
3737

38-
get_returns_none = d.set_get_returns_none(2)
39-
d.set_get_returns_none(get_returns_none)
38+
get_returns_none = d.set_get_returns_none(2)
39+
d.set_get_returns_none(get_returns_none)
4040

4141
d.open(self.filename, db.DB_RECNO, db.DB_CREATE)
4242

@@ -69,13 +69,13 @@ def test01_basic(self):
6969
else:
7070
self.fail("expected exception")
7171

72-
# test that has_key raises DB exceptions (fixed in pybsddb 4.3.2)
73-
try:
74-
d.has_key(0)
75-
except db.DBError, val:
76-
pass
77-
else:
78-
self.fail("has_key did not raise a proper exception")
72+
# test that has_key raises DB exceptions (fixed in pybsddb 4.3.2)
73+
try:
74+
d.has_key(0)
75+
except db.DBError, val:
76+
pass
77+
else:
78+
self.fail("has_key did not raise a proper exception")
7979

8080
try:
8181
data = d[100]
@@ -84,13 +84,13 @@ def test01_basic(self):
8484
else:
8585
self.fail("expected exception")
8686

87-
try:
88-
data = d.get(100)
89-
except db.DBNotFoundError, val:
90-
if get_returns_none:
91-
self.fail("unexpected exception")
92-
else:
93-
assert data == None
87+
try:
88+
data = d.get(100)
89+
except db.DBNotFoundError, val:
90+
if get_returns_none:
91+
self.fail("unexpected exception")
92+
else:
93+
assert data == None
9494

9595
keys = d.keys()
9696
if verbose:
@@ -178,14 +178,14 @@ def test01_basic(self):
178178
try:
179179
d.get(99)
180180
except db.DBKeyEmptyError, val:
181-
if get_returns_none:
182-
self.fail("unexpected DBKeyEmptyError exception")
183-
else:
184-
assert val[0] == db.DB_KEYEMPTY
185-
if verbose: print val
181+
if get_returns_none:
182+
self.fail("unexpected DBKeyEmptyError exception")
183+
else:
184+
assert val[0] == db.DB_KEYEMPTY
185+
if verbose: print val
186186
else:
187-
if not get_returns_none:
188-
self.fail("expected exception")
187+
if not get_returns_none:
188+
self.fail("expected exception")
189189

190190
rec = c.set(40)
191191
while rec:

‎Lib/test/test_dumbdbm.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ def test_line_endings(self):
8686
data = open(_fname + '.dir').read()
8787
data = data.replace('\n', '\r\n')
8888
open(_fname + '.dir', 'wb').write(data)
89-
89+
9090
f = dumbdbm.open(_fname)
9191
self.assertEqual(f['1'], 'hello')
9292
self.assertEqual(f['2'], 'hello2')
93-
94-
93+
94+
9595
def read_helper(self, f):
9696
keys = self.keys_helper(f)
9797
for key in self._dict:

0 commit comments

Comments
 (0)