launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/remove-2.6-suppressions into lp:launchpad.

Commit message:
Stop filtering deprecation warnings about md5/sha/sets, since our dependencies have been updated.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #570246 in Launchpad itself: "Remove warning suppressions added as part of python2.6 migration"
  https://bugs.launchpad.net/launchpad/+bug/570246

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/remove-2.6-suppressions/+merge/315216
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/remove-2.6-suppressions into lp:launchpad.

=== modified file 'buildout-templates/_pythonpath.py.in'
--- buildout-templates/_pythonpath.py.in	2016-12-22 16:32:38 +0000
+++ buildout-templates/_pythonpath.py.in	2017-01-20 12:49:42 +0000
@@ -14,12 +14,6 @@
 import sys
 import warnings
 
-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
-# warnings.
-warnings.filterwarnings(
-    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
-    )
-
 site_dir = ${scripts:parts-directory|path-repr}
 
 if ('site' in sys.modules and

=== modified file 'buildout-templates/bin/test.in'
--- buildout-templates/bin/test.in	2014-01-24 04:40:36 +0000
+++ buildout-templates/bin/test.in	2017-01-20 12:49:42 +0000
@@ -131,17 +131,6 @@
 warnings.filterwarnings(
     'ignore', 'bzrlib.*was deprecated', DeprecationWarning,
     )
-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
-# warnings.
-# We cannot narrow this warnings filter to just twisted because
-# warnings.warn_explicit() sees this import as coming from importfascist, not
-# from twisted.  It makes no sense to put module='importfascist' here though
-# because /everything/ gets imported through it.  So, sad as it is, until
-# twisted doesn't produce warnings under Python 2.6, just ignore all these
-# deprecations.
-warnings.filterwarnings(
-    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
-    )
 # The next one is caused by a lamosity in python-openid.  The following change
 # to openid/server/server.py would make the warning filter unnecessary:
 # 978c974,974

=== modified file 'lib/lp/services/database/tests/script_isolation.py'
--- lib/lp/services/database/tests/script_isolation.py	2012-04-06 17:28:25 +0000
+++ lib/lp/services/database/tests/script_isolation.py	2017-01-20 12:49:42 +0000
@@ -10,12 +10,6 @@
 
 import warnings
 
-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
-# warnings.
-warnings.filterwarnings(
-    'ignore', '.*(md5|sha|sets)', DeprecationWarning,
-    )
-
 import transaction
 
 from lp.services.config import dbconfig