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

Skip to content

Commit 286a0d2

Browse files
benjaminpbenjaminp
committed
Merged revisions 73725 via svnmerge from
svn+ssh://[email protected]/python/trunk ................ r73725 | benjamin.peterson | 2009-06-30 19:49:09 -0500 (Tue, 30 Jun 2009) | 21 lines Merged revisions 73379,73388,73507,73722 via svnmerge from svn+ssh://[email protected]/sandbox/trunk/2to3/lib2to3 ........ r73379 | benjamin.peterson | 2009-06-11 18:06:21 -0500 (Thu, 11 Jun 2009) | 1 line use a real conditional expresion ........ r73388 | benjamin.peterson | 2009-06-12 09:44:29 -0500 (Fri, 12 Jun 2009) | 1 line fix typo in last fix ........ r73507 | benjamin.peterson | 2009-06-22 13:32:04 -0500 (Mon, 22 Jun 2009) | 1 line remove svn:executable property ........ r73722 | benjamin.peterson | 2009-06-30 19:44:30 -0500 (Tue, 30 Jun 2009) | 1 line replace fail* with assert* ........ ................
1 parent a4aba66 commit 286a0d2

5 files changed

Lines changed: 183 additions & 183 deletions

File tree

‎Lib/lib2to3/fixes/fix_dict.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def transform(self, node, results):
6666
new = pytree.Node(syms.power, args)
6767
if not special:
6868
new.prefix = ""
69-
new = Call(Name(isiter and "iter" or "list"), [new])
69+
new = Call(Name("iter" if isiter else "list"), [new])
7070
if tail:
7171
new = pytree.Node(syms.power, [new] + tail)
7272
new.prefix = node.prefix

‎Lib/lib2to3/refactor.py‎

100755100644
File mode changed.

‎Lib/lib2to3/tests/test_fixers.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@ def _check(self, before, after):
3232
before = support.reformat(before)
3333
after = support.reformat(after)
3434
tree = self.refactor.refactor_string(before, self.filename)
35-
self.failUnlessEqual(after, str(tree))
35+
self.assertEqual(after, str(tree))
3636
return tree
3737

3838
def check(self, before, after, ignore_warnings=False):
3939
tree = self._check(before, after)
40-
self.failUnless(tree.was_changed)
40+
self.assertTrue(tree.was_changed)
4141
if not ignore_warnings:
42-
self.failUnlessEqual(self.fixer_log, [])
42+
self.assertEqual(self.fixer_log, [])
4343

4444
def warns(self, before, after, message, unchanged=False):
4545
tree = self._check(before, after)
46-
self.failUnless(message in "".join(self.fixer_log))
46+
self.assertTrue(message in "".join(self.fixer_log))
4747
if not unchanged:
48-
self.failUnless(tree.was_changed)
48+
self.assertTrue(tree.was_changed)
4949

5050
def warns_unchanged(self, before, message):
5151
self.warns(before, before, message, unchanged=True)
5252

5353
def unchanged(self, before, ignore_warnings=False):
5454
self._check(before, before)
5555
if not ignore_warnings:
56-
self.failUnlessEqual(self.fixer_log, [])
56+
self.assertEqual(self.fixer_log, [])
5757

5858
def assert_runs_after(self, *names):
5959
fixes = [self.fixer]

‎Lib/lib2to3/tests/test_pytree.py‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ def test_leaf_equality(self):
8181
def test_leaf_prefix(self):
8282
l1 = pytree.Leaf(100, "foo")
8383
self.assertEqual(l1.prefix, "")
84-
self.failIf(l1.was_changed)
84+
self.assertFalse(l1.was_changed)
8585
l1.prefix = " ##\n\n"
8686
self.assertEqual(l1.prefix, " ##\n\n")
87-
self.failUnless(l1.was_changed)
87+
self.assertTrue(l1.was_changed)
8888

8989
def test_node(self):
9090
l1 = pytree.Leaf(100, "foo")
@@ -154,13 +154,13 @@ def test_replace(self):
154154
l3 = pytree.Leaf(100, "bar")
155155
n1 = pytree.Node(1000, [l1, l2, l3])
156156
self.assertEqual(n1.children, [l1, l2, l3])
157-
self.failUnless(isinstance(n1.children, list))
158-
self.failIf(n1.was_changed)
157+
self.assertTrue(isinstance(n1.children, list))
158+
self.assertFalse(n1.was_changed)
159159
l2new = pytree.Leaf(100, "-")
160160
l2.replace(l2new)
161161
self.assertEqual(n1.children, [l1, l2new, l3])
162-
self.failUnless(isinstance(n1.children, list))
163-
self.failUnless(n1.was_changed)
162+
self.assertTrue(isinstance(n1.children, list))
163+
self.assertTrue(n1.was_changed)
164164

165165
def test_replace_with_list(self):
166166
l1 = pytree.Leaf(100, "foo")
@@ -170,7 +170,7 @@ def test_replace_with_list(self):
170170

171171
l2.replace([pytree.Leaf(100, "*"), pytree.Leaf(100, "*")])
172172
self.assertEqual(str(n1), "foo**bar")
173-
self.failUnless(isinstance(n1.children, list))
173+
self.assertTrue(isinstance(n1.children, list))
174174

175175
def test_post_order(self):
176176
l1 = pytree.Leaf(100, "foo")
@@ -186,42 +186,42 @@ def test_pre_order(self):
186186

187187
def test_changed(self):
188188
l1 = pytree.Leaf(100, "f")
189-
self.failIf(l1.was_changed)
189+
self.assertFalse(l1.was_changed)
190190
l1.changed()
191-
self.failUnless(l1.was_changed)
191+
self.assertTrue(l1.was_changed)
192192

193193
l1 = pytree.Leaf(100, "f")
194194
n1 = pytree.Node(1000, [l1])
195-
self.failIf(n1.was_changed)
195+
self.assertFalse(n1.was_changed)
196196
n1.changed()
197-
self.failUnless(n1.was_changed)
197+
self.assertTrue(n1.was_changed)
198198

199199
l1 = pytree.Leaf(100, "foo")
200200
l2 = pytree.Leaf(100, "+")
201201
l3 = pytree.Leaf(100, "bar")
202202
n1 = pytree.Node(1000, [l1, l2, l3])
203203
n2 = pytree.Node(1000, [n1])
204-
self.failIf(l1.was_changed)
205-
self.failIf(n1.was_changed)
206-
self.failIf(n2.was_changed)
204+
self.assertFalse(l1.was_changed)
205+
self.assertFalse(n1.was_changed)
206+
self.assertFalse(n2.was_changed)
207207

208208
n1.changed()
209-
self.failUnless(n1.was_changed)
210-
self.failUnless(n2.was_changed)
211-
self.failIf(l1.was_changed)
209+
self.assertTrue(n1.was_changed)
210+
self.assertTrue(n2.was_changed)
211+
self.assertFalse(l1.was_changed)
212212

213213
def test_leaf_constructor_prefix(self):
214214
for prefix in ("xyz_", ""):
215215
l1 = pytree.Leaf(100, "self", prefix=prefix)
216-
self.failUnless(str(l1), prefix + "self")
216+
self.assertTrue(str(l1), prefix + "self")
217217
self.assertEqual(l1.prefix, prefix)
218218

219219
def test_node_constructor_prefix(self):
220220
for prefix in ("xyz_", ""):
221221
l1 = pytree.Leaf(100, "self")
222222
l2 = pytree.Leaf(100, "foo", prefix="_")
223223
n1 = pytree.Node(1000, [l1, l2], prefix=prefix)
224-
self.failUnless(str(n1), prefix + "self_foo")
224+
self.assertTrue(str(n1), prefix + "self_foo")
225225
self.assertEqual(n1.prefix, prefix)
226226
self.assertEqual(l1.prefix, prefix)
227227
self.assertEqual(l2.prefix, "_")
@@ -237,17 +237,17 @@ def test_remove(self):
237237
self.assertEqual(l1.parent, n1)
238238
self.assertEqual(n1.parent, None)
239239
self.assertEqual(n2.parent, None)
240-
self.failIf(n1.was_changed)
241-
self.failUnless(n2.was_changed)
240+
self.assertFalse(n1.was_changed)
241+
self.assertTrue(n2.was_changed)
242242

243243
self.assertEqual(l2.remove(), 1)
244244
self.assertEqual(l1.remove(), 0)
245245
self.assertEqual(n1.children, [])
246246
self.assertEqual(l1.parent, None)
247247
self.assertEqual(n1.parent, None)
248248
self.assertEqual(n2.parent, None)
249-
self.failUnless(n1.was_changed)
250-
self.failUnless(n2.was_changed)
249+
self.assertTrue(n1.was_changed)
250+
self.assertTrue(n2.was_changed)
251251

252252
def test_remove_parentless(self):
253253
n1 = pytree.Node(1000, [])
@@ -316,7 +316,7 @@ def test_node_next_sibling(self):
316316
n2 = pytree.Node(1000, [])
317317
p1 = pytree.Node(1000, [n1, n2])
318318

319-
self.failUnless(n1.next_sibling is n2)
319+
self.assertTrue(n1.next_sibling is n2)
320320
self.assertEqual(n2.next_sibling, None)
321321
self.assertEqual(p1.next_sibling, None)
322322

@@ -325,7 +325,7 @@ def test_leaf_next_sibling(self):
325325
l2 = pytree.Leaf(100, "b")
326326
p1 = pytree.Node(1000, [l1, l2])
327327

328-
self.failUnless(l1.next_sibling is l2)
328+
self.assertTrue(l1.next_sibling is l2)
329329
self.assertEqual(l2.next_sibling, None)
330330
self.assertEqual(p1.next_sibling, None)
331331

@@ -334,7 +334,7 @@ def test_node_prev_sibling(self):
334334
n2 = pytree.Node(1000, [])
335335
p1 = pytree.Node(1000, [n1, n2])
336336

337-
self.failUnless(n2.prev_sibling is n1)
337+
self.assertTrue(n2.prev_sibling is n1)
338338
self.assertEqual(n1.prev_sibling, None)
339339
self.assertEqual(p1.prev_sibling, None)
340340

@@ -343,7 +343,7 @@ def test_leaf_prev_sibling(self):
343343
l2 = pytree.Leaf(100, "b")
344344
p1 = pytree.Node(1000, [l1, l2])
345345

346-
self.failUnless(l2.prev_sibling is l1)
346+
self.assertTrue(l2.prev_sibling is l1)
347347
self.assertEqual(l1.prev_sibling, None)
348348
self.assertEqual(p1.prev_sibling, None)
349349

@@ -416,7 +416,7 @@ def test_wildcard(self):
416416
r = {}
417417
self.assertTrue(pw.match_seq([l1, l3], r))
418418
self.assertEqual(r, {"pl": l3, "pw": [l1, l3]})
419-
self.assert_(r["pl"] is l3)
419+
self.assertTrue(r["pl"] is l3)
420420
r = {}
421421

422422
def test_generate_matches(self):
@@ -459,5 +459,5 @@ def test_has_key_example(self):
459459
l3 = pytree.Leaf(8, ")")
460460
node = pytree.Node(331, [l1, l2, l3])
461461
r = {}
462-
self.assert_(pattern.match(node, r))
462+
self.assertTrue(pattern.match(node, r))
463463
self.assertEqual(r["args"], [l2])

0 commit comments

Comments
 (0)