Applying patch #728656, by logistix, fixing opening of nonexistent

niemeyer · niemeyer · commit 572f5233f026 · 2003-04-29T14:53:08.000Z
bz2 files. Also, included a testcase for this problem.
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
@@ -219,11 +219,16 @@ def testSeekPreStart(self):
         bz2f.close()
 
     def testOpenDel(self):
+        # "Test opening and deleting a file many times"
         self.createTempFile()
         for i in xrange(10000):
             o = BZ2File(self.filename)
             del o
 
+    def testOpenNonexistent(self):
+        # "Test opening a nonexistent file"
+        self.assertRaises(IOError, BZ2File, "/non/existent")
+
 class BZ2CompressorTest(BaseTest):
     def testCompress(self):
         # "Test BZ2Compressor.compress()/flush()"
diff --git a/Modules/bz2module.c b/Modules/bz2module.c
@@ -1388,7 +1388,7 @@ BZ2File_dealloc(BZ2FileObject *self)
 			break;
 	}
 	Util_DropReadAhead(self);
-	Py_DECREF(self->file);
+	Py_XDECREF(self->file);
 	self->ob_type->tp_free((PyObject *)self);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1388,7 +1388,7 @@ BZ2File_dealloc(BZ2FileObject *self)`
`1388`	`1388`	`break;`
`1389`	`1389`	`}`
`1390`	`1390`	`Util_DropReadAhead(self);`
`1391`		`- Py_DECREF(self->file);`
	`1391`	`+ Py_XDECREF(self->file);`
`1392`	`1392`	`self->ob_type->tp_free((PyObject *)self);`
`1393`	`1393`	`}`
`1394`	`1394`