Skip to content

Commit c05b5b7

Browse files
author
Alexander Belchenko
committed
improve Python 2.6 compatibility: use msg instead of message for verbatim Exception strings.
1 parent cd783e6 commit c05b5b7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

intelhex/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ def getsz(self, addr):
644644
break
645645
i += 1
646646
except KeyError:
647-
raise NotEnoughDataError(message=('Bad access at 0x%X: '
647+
raise NotEnoughDataError(msg=('Bad access at 0x%X: '
648648
'not enough data to read zero-terminated string') % addr)
649649
return self.gets(addr, i)
650650

@@ -1050,17 +1050,17 @@ class IntelHexError(Exception):
10501050

10511051
_fmt = 'IntelHex base error' #: format string
10521052

1053-
def __init__(self, message=None, **kw):
1053+
def __init__(self, msg=None, **kw):
10541054
"""Initialize the Exception with the given message.
10551055
"""
1056-
self.message = message
1056+
self.msg = msg
10571057
for key, value in kw.items():
10581058
setattr(self, key, value)
10591059

10601060
def __str__(self):
10611061
"""Return the message in this Exception."""
1062-
if self.message:
1063-
return self.message
1062+
if self.msg:
1063+
return self.msg
10641064
try:
10651065
return self._fmt % self.__dict__
10661066
except (NameError, ValueError, KeyError), e:

intelhex/test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,8 +1069,8 @@ def test_IntelHexError(self):
10691069

10701070
def test_IntelHexError_message(self):
10711071
self.assertEqualExc('IntelHex custom error message',
1072-
IntelHexError(message='IntelHex custom error message'))
1073-
self.assertEqualExc('IntelHex base error', IntelHexError(message=''))
1072+
IntelHexError(msg='IntelHex custom error message'))
1073+
self.assertEqualExc('IntelHex base error', IntelHexError(msg=''))
10741074

10751075
def test_HexReaderError(self):
10761076
self.assertEqualExc('Hex reader base error', HexReaderError())

0 commit comments

Comments
 (0)