[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/hash.py [r1-2]

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Branch:         r1-2
Changes by:     Andrew Ferguson <owsla> 09/02/10 18:31:33

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : hash.py 

Log message:
        Fix Python 2.2 compatibility.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.6&r2=1.338.2.7
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/hash.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.4&r2=1.4.2.1

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.6
retrieving revision 1.338.2.7
diff -u -b -r1.338.2.6 -r1.338.2.7
--- CHANGELOG   10 Feb 2009 18:30:21 -0000      1.338.2.6
+++ CHANGELOG   10 Feb 2009 18:31:33 -0000      1.338.2.7
@@ -1,6 +1,8 @@
 New in v1.2.7 (????/??/??)
 ---------------------------
 
+Fix Python 2.2 compatibility. Closes Savannah bug #25529. (Andrew Ferguson)
+
 Fix typo which caused failure when checking if another rdiff-backup process is
 running on Windows. Thanks to Ryan for the bug report. (Andrew Ferguson)
 

Index: rdiff_backup/hash.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/hash.py,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- rdiff_backup/hash.py        18 Dec 2008 02:55:57 -0000      1.4
+++ rdiff_backup/hash.py        10 Feb 2009 18:31:33 -0000      1.4.2.1
@@ -22,7 +22,7 @@
 # Until rdiff-backup is ported to Python 3 (or abandons support for versions
 # below Python 2.5), we'll ignore the warning about the deprecated sha module
 import warnings
-warnings.simplefilter('ignore')
+warnings.filterwarnings("ignore", ".*sha module.*", DeprecationWarning)
 
 import sha
 import Globals