tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Move suppression of DeprecationWarning about BaseException.message from sftpd.py to main __init__.py. Also, remove the global suppression of the 'integer argument expected, got float' warning, which turned out to be a bug.

This commit is contained in:
david-sarah 2010-05-28 22:05:37 -07:00
parent e867985539
commit 8ed28a95e7
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/allmydata/__init__.py
View File

@ -35,11 +35,10 @@ finally:
warnings.filters.pop() warnings.filters.pop()
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, warnings.filterwarnings("ignore", category=DeprecationWarning,
message="integer argument expected, got float", message="BaseException.message has been deprecated as of Python 2.6",
append=True) module=".*twisted.*", append=True)
__version__ = "unknown" __version__ = "unknown"
try: try:

7
src/allmydata/frontends/sftpd.py
View File

@ -33,13 +33,6 @@ from allmydata.immutable.upload import FileHandle
from pycryptopp.cipher.aes import AES 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 noisy = True
use_foolscap_logging = True use_foolscap_logging = True