From 07d291ae595ef2414e35688dfba9a9f25361cda5 Mon Sep 17 00:00:00 2001 From: Nadeem Vawda Date: Mon, 30 May 2011 01:44:45 +0200 Subject: Remove unused data from test_bz2. DATA_CRLF was used to test BZ2File's universal newline logic, which was removed in changeset ce63a5dcb0af. The tests themselves were removed in fbabdb0d7dd2. --- Lib/test/test_bz2.py | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Lib/test/test_bz2.py b/Lib/test/test_bz2.py index 5783cae..350d2de 100644 --- a/Lib/test/test_bz2.py +++ b/Lib/test/test_bz2.py @@ -47,7 +47,6 @@ class BaseTest(unittest.TestCase): ] TEXT = b''.join(TEXT_LINES) DATA = b'BZh91AY&SY.\xc8N\x18\x00\x01>_\x80\x00\x10@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe00\x01\x99\xaa\x00\xc0\x03F\x86\x8c#&\x83F\x9a\x03\x06\xa6\xd0\xa6\x93M\x0fQ\xa7\xa8\x06\x804hh\x12$\x11\xa4i4\xf14S\xd2\x88\xe5\xcd9gd6\x0b\n\xe9\x9b\xd5\x8a\x99\xf7\x08.K\x8ev\xfb\xf7xw\xbb\xdf\xa1\x92\xf1\xdd|/";\xa2\xba\x9f\xd5\xb1#A\xb6\xf6\xb3o\xc9\xc5y\\\xebO\xe7\x85\x9a\xbc\xb6f8\x952\xd5\xd7"%\x89>V,\xf7\xa6z\xe2\x9f\xa3\xdf\x11\x11"\xd6E)I\xa9\x13^\xca\xf3r\xd0\x03U\x922\xf26\xec\xb6\xed\x8b\xc3U\x13\x9d\xc5\x170\xa4\xfa^\x92\xacDF\x8a\x97\xd6\x19\xfe\xdd\xb8\xbd\x1a\x9a\x19\xa3\x80ankR\x8b\xe5\xd83]\xa9\xc6\x08\x82f\xf6\xb9"6l$\xb8j@\xc0\x8a\xb0l1..\xbak\x83ls\x15\xbc\xf4\xc1\x13\xbe\xf8E\xb8\x9d\r\xa8\x9dk\x84\xd3n\xfa\xacQ\x07\xb1%y\xaav\xb4\x08\xe0z\x1b\x16\xf5\x04\xe9\xcc\xb9\x08z\x1en7.G\xfc]\xc9\x14\xe1B@\xbb!8`' - DATA_CRLF = b'BZh91AY&SY\xaez\xbbN\x00\x01H\xdf\x80\x00\x12@\x02\xff\xf0\x01\x07n\x00?\xe7\xff\xe0@\x01\xbc\xc6`\x86*\x8d=M\xa9\x9a\x86\xd0L@\x0fI\xa6!\xa1\x13\xc8\x88jdi\x8d@\x03@\x1a\x1a\x0c\x0c\x83 \x00\xc4h2\x19\x01\x82D\x84e\t\xe8\x99\x89\x19\x1ah\x00\r\x1a\x11\xaf\x9b\x0fG\xf5(\x1b\x1f?\t\x12\xcf\xb5\xfc\x95E\x00ps\x89\x12^\xa4\xdd\xa2&\x05(\x87\x04\x98\x89u\xe40%\xb6\x19\'\x8c\xc4\x89\xca\x07\x0e\x1b!\x91UIFU%C\x994!DI\xd2\xfa\xf0\xf1N8W\xde\x13A\xf5\x9cr%?\x9f3;I45A\xd1\x8bT\xb1\xa4\xc7\x8d\x1a\\"\xad\xa1\xabyBg\x15\xb9l\x88\x88\x91k"\x94\xa4\xd4\x89\xae*\xa6\x0b\x10\x0c\xd6\xd4m\xe86\xec\xb5j\x8a\x86j\';\xca.\x01I\xf2\xaaJ\xe8\x88\x8cU+t3\xfb\x0c\n\xa33\x13r2\r\x16\xe0\xb3(\xbf\x1d\x83r\xe7M\xf0D\x1365\xd8\x88\xd3\xa4\x92\xcb2\x06\x04\\\xc1\xb0\xea//\xbek&\xd8\xe6+t\xe5\xa1\x13\xada\x16\xder5"w]\xa2i\xb7[\x97R \xe2IT\xcd;Z\x04dk4\xad\x8a\t\xd3\x81z\x10\xf1:^`\xab\x1f\xc5\xdc\x91N\x14$+\x9e\xae\xd3\x80' if has_cmdline_bunzip2: def decompress(self, data): @@ -78,15 +77,9 @@ class BZ2FileTest(BaseTest): if os.path.isfile(self.filename): os.unlink(self.filename) - def getData(self, crlf=False): - if crlf: - return self.DATA_CRLF - else: - return self.DATA - - def createTempFile(self, crlf=False, streams=1): + def createTempFile(self, streams=1): with open(self.filename, "wb") as f: - f.write(self.getData(crlf) * streams) + f.write(self.DATA * streams) def testRead(self): self.createTempFile() @@ -436,14 +429,14 @@ class BZ2FileTest(BaseTest): # Tests for a BZ2File wrapping another file object: def testReadBytesIO(self): - with BytesIO(self.getData()) as bio: + with BytesIO(self.DATA) as bio: with BZ2File(fileobj=bio) as bz2f: self.assertRaises(TypeError, bz2f.read, None) self.assertEqual(bz2f.read(), self.TEXT) self.assertFalse(bio.closed) def testPeekBytesIO(self): - with BytesIO(self.getData()) as bio: + with BytesIO(self.DATA) as bio: with BZ2File(fileobj=bio) as bz2f: pdata = bz2f.peek() self.assertNotEqual(len(pdata), 0) @@ -459,14 +452,14 @@ class BZ2FileTest(BaseTest): self.assertFalse(bio.closed) def testSeekForwardBytesIO(self): - with BytesIO(self.getData()) as bio: + with BytesIO(self.DATA) as bio: with BZ2File(fileobj=bio) as bz2f: self.assertRaises(TypeError, bz2f.seek) bz2f.seek(150) self.assertEqual(bz2f.read(), self.TEXT[150:]) def testSeekBackwardsBytesIO(self): - with BytesIO(self.getData()) as bio: + with BytesIO(self.DATA) as bio: with BZ2File(fileobj=bio) as bz2f: bz2f.read(500) bz2f.seek(-150, 1) -- cgit v0.12