Move suppression of DeprecationWarning about BaseException.message from sftpd.py...

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index 1f9a265baca02a9ca63b436a705e3fe91ff0f53c..acaeda272dbb06b79fec1788da2834756c1744ef 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -35,11 +35,10 @@ finally:
     warnings.filters.pop()
     warnings.filters.pop()
 
-
+# This warning is generated by twisted, but not when it is imported, only on an error.
 warnings.filterwarnings("ignore", category=DeprecationWarning,
-    message="integer argument expected, got float",
-    append=True)
-
+    message="BaseException.message has been deprecated as of Python 2.6",
+    module=".*twisted.*", append=True)
 
 __version__ = "unknown"
 try:

diff --git a/src/allmydata/frontends/sftpd.py b/src/allmydata/frontends/sftpd.py
index e0516d81864c5a1d411de697c1a84b3c134729aa..e44270d83c89cfae01bf6cf9db577ccba34ec175 100644 (file)
--- a/src/allmydata/frontends/sftpd.py
+++ b/src/allmydata/frontends/sftpd.py
@@ -33,13 +33,6 @@ from allmydata.immutable.upload import FileHandle
 
 from pycryptopp.cipher.aes import AES
 
-# twisted.conch.ssh.filetransfer generates this warning, but not when it is imported,
-# only on an error.
-import warnings
-warnings.filterwarnings("ignore", category=DeprecationWarning,
-    message="BaseException.message has been deprecated as of Python 2.6",
-    module=".*filetransfer", append=True)
-
 noisy = True
 use_foolscap_logging = True