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
commitc4a7fb3eaaee130ec18b9b928f9eb0b74d37acbd (patch)
tree868493f254d17a0d4f666cb07a6faeb268cff845
parentca45c1cd1be4be1df46839e4b220b1bf636faee1 (diff)
downloadrdiff-backup-c4a7fb3eaaee130ec18b9b928f9eb0b74d37acbd.tar.gz
Fix Python 2.2 compatibility.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@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 b0bbdf2..8fcc14c 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -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)
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