Fix a bunch of UnboundLocalErrors when the tests fail.
diff --git a/Lib/test/test_deque.py b/Lib/test/test_deque.py
index b69110d..a185f78 100644
--- a/Lib/test/test_deque.py
+++ b/Lib/test/test_deque.py
@@ -63,27 +63,27 @@
self.assertEqual(list(d), range(7, 10))
d = deque(xrange(200), maxlen=10)
d.append(d)
+ fo = open(test_support.TESTFN, "wb")
try:
- fo = open(test_support.TESTFN, "wb")
print >> fo, d,
fo.close()
fo = open(test_support.TESTFN, "rb")
self.assertEqual(fo.read(), repr(d))
finally:
fo.close()
- os.remove(test_support.TESTFN)
+ test_support.unlink(test_support.TESTFN)
d = deque(range(10), maxlen=None)
self.assertEqual(repr(d), 'deque([0, 1, 2, 3, 4, 5, 6, 7, 8, 9])')
+ fo = open(test_support.TESTFN, "wb")
try:
- fo = open(test_support.TESTFN, "wb")
print >> fo, d,
fo.close()
fo = open(test_support.TESTFN, "rb")
self.assertEqual(fo.read(), repr(d))
finally:
fo.close()
- os.remove(test_support.TESTFN)
+ test_support.unlink(test_support.TESTFN)
def test_comparisons(self):
d = deque('xabc'); d.popleft()
@@ -281,15 +281,15 @@
def test_print(self):
d = deque(xrange(200))
d.append(d)
+ fo = open(test_support.TESTFN, "wb")
try:
- fo = open(test_support.TESTFN, "wb")
print >> fo, d,
fo.close()
fo = open(test_support.TESTFN, "rb")
self.assertEqual(fo.read(), repr(d))
finally:
fo.close()
- os.remove(test_support.TESTFN)
+ test_support.unlink(test_support.TESTFN)
def test_init(self):
self.assertRaises(TypeError, deque, 'abc', 2, 3);
diff --git a/Lib/test/test_uu.py b/Lib/test/test_uu.py
index 9aad56e..346cfb2 100644
--- a/Lib/test/test_uu.py
+++ b/Lib/test/test_uu.py
@@ -112,6 +112,7 @@
del self.tmpout
def test_encode(self):
+ fin = fout = None
try:
fin = open(self.tmpin, 'wb')
fin.write(plaintext)
@@ -140,6 +141,7 @@
self._kill(fout)
def test_decode(self):
+ f = None
try:
f = open(self.tmpin, 'w')
f.write(encodedtextwrapped % (0644, self.tmpout))
@@ -159,6 +161,7 @@
def test_decodetwice(self):
# Verify that decode() will refuse to overwrite an existing file
+ f = None
try:
f = cStringIO.StringIO(encodedtextwrapped % (0644, self.tmpout))