summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-02-10 18:32:42 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-02-10 18:32:42 +0000
commit1c6d599299c80dba1fb2ecb6c5e8bb02db2f9054 (patch)
treeada045fe08d44e2767aba8da96392f1eed46e415
parent1ec2abdc64c72a1ac48f7d94255aea4ea6ef220c (diff)
downloadrdiff-backup-1c6d599299c80dba1fb2ecb6c5e8bb02db2f9054.tar.gz
Fix Python 2.2 compatibility.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@1023 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG2
-rw-r--r--rdiff-backup/rdiff_backup/hash.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index edc1660..27fd3a2 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,8 @@
New in v1.3.2 (????/??/??)
---------------------------
+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)
diff --git a/rdiff-backup/rdiff_backup/hash.py b/rdiff-backup/rdiff_backup/hash.py
index 317ad96..7758dc9 100644
--- a/rdiff-backup/rdiff_backup/hash.py
+++ b/rdiff-backup/rdiff_backup/hash.py
@@ -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