From 8d50164ecfd82a2eff8fec8c72e54d36d9bb601b Mon Sep 17 00:00:00 2001
From: Mike Naberezny <mike@naberezny.com>
Date: Tue, 13 Oct 2009 20:27:47 -0700
Subject: [PATCH] Fixed deprecation warnings on Python 2.6.

---
 CHANGES.txt                          |  4 ++++
 src/py65/tests/utils/test_hexdump.py | 24 ++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1c8cbdd..78337f5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
diff --git a/src/py65/tests/utils/test_hexdump.py b/src/py65/tests/utils/test_hexdump.py
index 2a9197a..67b74de 100644
--- a/src/py65/tests/utils/test_hexdump.py
+++ b/src/py65/tests/utils/test_hexdump.py
@@ -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'