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:
parent
e867985539
commit
8ed28a95e7
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue