@@ -1,3 +1,7 @@ +* Next Release * + + - Fixed deprecation warnings on Python 2.6 + 0.7 (2009-09-03) - When using the monitor, the nonblocking character input at CHANGES.txt @@ -27,55 +27,55 @@ class HexdumpLoaderTests(unittest.TestCase): try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Start address was not found in data' - self.assert_(e.message.startswith('Start address')) + self.assert_(why[0].startswith('Start address')) def test_raises_when_start_address_is_invalid(self): text = 'oops: aa bb cc' try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Could not parse address: oops' - self.assertEqual(msg, e.message) + self.assertEqual(msg, why[0]) def test_raises_when_start_address_is_too_short(self): text = '01: aa bb cc' try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Expected address to be 2 bytes, got 1' - self.assertEqual(msg, e.message) + self.assertEqual(msg, why[0]) def test_raises_when_start_address_is_too_long(self): text = '010304: aa bb cc' try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Expected address to be 2 bytes, got 3' - self.assertEqual(msg, e.message) + self.assertEqual(msg, why[0]) def test_raises_when_next_address_is_unexpected(self): text = "c000: aa\nc002: cc" try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Non-contigous block detected. Expected next ' \ 'address to be $c001, label was $c002' - self.assertEqual(msg, e.message) + self.assertEqual(msg, why[0]) def test_raises_when_data_is_invalid(self): text = 'c000: foo' try: Loader(text) self.fail() - except ValueError, e: + except ValueError, why: msg = 'Could not parse data: foo' - self.assertEqual(msg, e.message) + self.assertEqual(msg, why[0]) def test_loads_data_without_dollar_signs(self): text = 'c000: aa bb' src/py65/tests/utils/test_hexdump.py 019a7553155c9dc2cf41481efa0f61b4bade98fb Mike Naberezny mike@naberezny.com http://github.com/mnaberez/py65/commit/8d50164ecfd82a2eff8fec8c72e54d36d9bb601b 8d50164ecfd82a2eff8fec8c72e54d36d9bb601b 2009-10-13T20:27:47-07:00 2009-10-13T20:27:47-07:00 Fixed deprecation warnings on Python 2.6. b33204715d12ee9e26e7ece287f48377fb938e4d Mike Naberezny mike@naberezny.com