diff options
| -rw-r--r-- | Lib/test/test_bz2.py | 26 | ||||
| -rw-r--r-- | Modules/bz2module.c | 13 |
2 files changed, 2 insertions, 37 deletions
diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index be871a6..28af42e 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -112,22 +112,6 @@ class BZ2FileTest(BaseTest): self.assertEqual(list(iter(bz2f)), sio.readlines()) bz2f.close() - def testUniversalNewlinesLF(self): - # "Test BZ2File.read() with universal newlines (\\n)" - self.createTempFile() - bz2f = BZ2File(self.filename, "rU") - self.assertEqual(bz2f.read(), self.TEXT) - self.assertEqual(bz2f.newlines, b"\n") - bz2f.close() - - def testUniversalNewlinesCRLF(self): - # "Test BZ2File.read() with universal newlines (\\r\\n)" - self.createTempFile(crlf=1) - bz2f = BZ2File(self.filename, "rU") - self.assertEqual(bz2f.read(), self.TEXT) - self.assertEqual(bz2f.newlines, b"\r\n") - bz2f.close() - def testWrite(self): # "Test BZ2File.write()" bz2f = BZ2File(self.filename, "w") @@ -240,16 +224,6 @@ class BZ2FileTest(BaseTest): # "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 = open(self.filename, "rb") - f.seek(0, 2) - self.assertEqual(f.tell(), len(self.DATA)) - f.close() - def testBug1191043(self): # readlines() for files containing no newline data = b'BZh91AY&SY\xd9b\x89]\x00\x00\x00\x03\x80\x04\x00\x02\x00\x0c\x00 \x00!\x9ah3M\x13<]\xc9\x14\xe1BCe\x8a%t' diff --git a/Modules/bz2module.c b/Modules/bz2module.c index 6e8e85f..17cad42 100644 --- a/Modules/bz2module.c +++ b/Modules/bz2module.c @@ -1294,17 +1294,8 @@ writing. When opened for writing, the file will be created if it doesn't\n\ exist, and truncated otherwise. If the buffering argument is given, 0 means\n\ unbuffered, and larger numbers specify the buffer size. If compresslevel\n\ is given, must be a number between 1 and 9.\n\ -") -PyDoc_STR( -"\n\ -Add a 'U' to mode to open the file for input with universal newline\n\ -support. Any line ending in the input file will be seen as a '\\n' in\n\ -Python. Also, a file so opened gains the attribute 'newlines'; the value\n\ -for this attribute is one of None (no newline read yet), '\\r', '\\n',\n\ -'\\r\\n' or a tuple containing all the newline types seen. Universal\n\ -newlines are available only when reading.\n\ -") -; +Data read is always returned in bytes; data written ought to be bytes.\n\ +"); static PyTypeObject BZ2File_Type = { PyObject_HEAD_INIT(NULL) |