Rev 2932: Avoid deprecation warnings. in http://code.launchpad.net/%7Ev-ladeuil/bzr/bzr.python26

[Vincent Ladeuil]

At http://code.launchpad.net/%7Ev-ladeuil/bzr/bzr.python26

------------------------------------------------------------
revno: 2932
revision-id:v.ladeuil+lp at free.fr-20071120105052-qehbkotj2y66jaef
parent: v.ladeuil+lp at free.fr-20071024142115-83gi49ooll2nqyxx
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: bzr.python26
timestamp: Tue 2007-11-20 11:50:52 +0100
message:
  Avoid deprecation warnings.
  
  * bzrlib/errors.py:
  (WeaveError.__init__): Use msg instead of message since 'message'
  as a BaseException attribute is deprecated in python-2.6.
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2007-10-12 05:26:46 +0000
+++ b/bzrlib/errors.py	2007-11-20 10:50:52 +0000
@@ -1213,11 +1213,11 @@
 
 class WeaveError(BzrError):
 
-    _fmt = "Error in processing weave: %(message)s"
+    _fmt = "Error in processing weave: %(msg)s"
 
-    def __init__(self, message=None):
+    def __init__(self, msg=None):
         BzrError.__init__(self)
-        self.message = message
+        self.msg = msg
 
 
 class WeaveRevisionAlreadyPresent(WeaveError):

=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py	2007-10-24 14:21:15 +0000
+++ b/bzrlib/osutils.py	2007-11-20 10:50:52 +0000
@@ -52,7 +52,7 @@
     )
 """)
 
-# sha is deprecated in python2.6 but haslib is available as of 2.5
+# sha is deprecated in python2.6 but hashlib is available as of 2.5
 if sys.version_info < (2, 5):
     import md5 as _md5
     md5 = _md5.new