Rev 4126: (mbp) Python2.6 dislikes the attribute name Exception.message in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4126
revision-id: pqm at pqm.ubuntu.com-20090312071229-wgby8yvwn51qcrbz
parent: pqm at pqm.ubuntu.com-20090312063229-ucuyuhmuc7ya8e54
parent: mbp at sourcefrog.net-20090312025409-gby75f53slguyax1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-03-12 07:12:29 +0000
message:
  (mbp) Python2.6 dislikes the attribute name Exception.message
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
    ------------------------------------------------------------
    revno: 4121.1.1
    revision-id: mbp at sourcefrog.net-20090312025409-gby75f53slguyax1
    parent: pqm at pqm.ubuntu.com-20090312021804-624908fcy28eisfn
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Thu 2009-03-12 12:54:09 +1000
    message:
      Python2.6 dislikes the attribute name Exception.message
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2009-03-11 10:22:00 +0000
+++ b/bzrlib/errors.py	2009-03-12 02:54:09 +0000
@@ -1003,15 +1003,15 @@
 
 class LockContention(LockError):
 
-    _fmt = 'Could not acquire lock "%(lock)s": %(message)s'
+    _fmt = 'Could not acquire lock "%(lock)s": %(msg)s'
     # TODO: show full url for lock, combining the transport and relative
     # bits?
 
     internal_error = False
 
-    def __init__(self, lock, message=''):
+    def __init__(self, lock, msg=''):
         self.lock = lock
-        self.message = message
+        self.msg = msg
 
 
 class LockBroken(LockError):