Bug #1194181: bz2.BZ2File didn't handle mode 'U' correctly.

birkenfeld · birkenfeld · commit 6b95f1d963d3 · 2005-06-03T19:47:00.000Z
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py
@@ -235,6 +235,16 @@ def testOpenNonexistent(self):
         # "Test opening a nonexistent file"
         self.assertRaises(IOError, BZ2File, "/non/existent")
 
+    def testModeU(self):
+        # Bug #1194181: bz2.BZ2File opened for write with mode "U"
+        self.createTempFile()
+        bz2f = BZ2File(self.filename, "U")
+        bz2f.close()
+        f = file(self.filename)
+        f.seek(0, 2)
+        self.assertEqual(f.tell(), len(self.DATA))
+        f.close()
+
 class BZ2CompressorTest(BaseTest):
     def testCompress(self):
         # "Test BZ2Compressor.compress()/flush()"
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -91,6 +91,8 @@ Core and builtins
 Extension Modules
 -----------------
 
+- Bug #1194181: bz2.BZ2File didn't handle mode 'U' correctly.
+
 - Patch #1212117: os.stat().st_flags is now accessible as a attribute
   if available on the platform.
 
diff --git a/Modules/bz2module.c b/Modules/bz2module.c
@@ -1308,6 +1308,10 @@ BZ2File_init(BZ2FileObject *self, PyObject *args, PyObject *kwargs)
 			break;
 	}
 
+	if (mode_char == 0) {
+		mode_char = 'r';
+	}
+
 	mode = (mode_char == 'r') ? "rb" : "wb";
 
 	self->file = PyObject_CallFunction((PyObject*)&PyFile_Type, "(Osi)",

Original file line number	Diff line number	Diff line change
`@@ -1308,6 +1308,10 @@ BZ2File_init(BZ2FileObject self, PyObject args, PyObject *kwargs)`
`1308`	`1308`	`break;`
`1309`	`1309`	`}`
`1310`	`1310`
	`1311`	`+ if (mode_char == 0) {`
	`1312`	`+ mode_char = 'r';`
	`1313`	`+ }`
	`1314`	`+`
`1311`	`1315`	`mode = (mode_char == 'r') ? "rb" : "wb";`
`1312`	`1316`
`1313`	`1317`	`self->file = PyObject_CallFunction((PyObject*)&PyFile_Type, "(Osi)",`