Merge lp:~cjwatson/launchpad/remove-2.6-suppressions into lp:launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 18323
Proposed branch: lp:~cjwatson/launchpad/remove-2.6-suppressions
Merge into: lp:launchpad
Diff against target: 55 lines (+0/-23)
3 files modified
buildout-templates/_pythonpath.py.in (+0/-6)
buildout-templates/bin/test.in (+0/-11)
lib/lp/services/database/tests/script_isolation.py (+0/-6)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-2.6-suppressions
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+315216@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout-templates/_pythonpath.py.in'
2--- buildout-templates/_pythonpath.py.in 2016-12-22 16:32:38 +0000
3+++ buildout-templates/_pythonpath.py.in 2017-01-20 12:49:42 +0000
4@@ -14,12 +14,6 @@
5 import sys
6 import warnings
7
8-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
9-# warnings.
10-warnings.filterwarnings(
11- 'ignore', '.*(md5|sha|sets)', DeprecationWarning,
12- )
13-
14 site_dir = ${scripts:parts-directory|path-repr}
15
16 if ('site' in sys.modules and
17
18=== modified file 'buildout-templates/bin/test.in'
19--- buildout-templates/bin/test.in 2014-01-24 04:40:36 +0000
20+++ buildout-templates/bin/test.in 2017-01-20 12:49:42 +0000
21@@ -131,17 +131,6 @@
22 warnings.filterwarnings(
23 'ignore', 'bzrlib.*was deprecated', DeprecationWarning,
24 )
25-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
26-# warnings.
27-# We cannot narrow this warnings filter to just twisted because
28-# warnings.warn_explicit() sees this import as coming from importfascist, not
29-# from twisted. It makes no sense to put module='importfascist' here though
30-# because /everything/ gets imported through it. So, sad as it is, until
31-# twisted doesn't produce warnings under Python 2.6, just ignore all these
32-# deprecations.
33-warnings.filterwarnings(
34- 'ignore', '.*(md5|sha|sets)', DeprecationWarning,
35- )
36 # The next one is caused by a lamosity in python-openid. The following change
37 # to openid/server/server.py would make the warning filter unnecessary:
38 # 978c974,974
39
40=== modified file 'lib/lp/services/database/tests/script_isolation.py'
41--- lib/lp/services/database/tests/script_isolation.py 2012-04-06 17:28:25 +0000
42+++ lib/lp/services/database/tests/script_isolation.py 2017-01-20 12:49:42 +0000
43@@ -10,12 +10,6 @@
44
45 import warnings
46
47-# XXX: 2010-04-26, Salgado, bug=570246: Silence python2.6 deprecation
48-# warnings.
49-warnings.filterwarnings(
50- 'ignore', '.*(md5|sha|sets)', DeprecationWarning,
51- )
52-
53 import transaction
54
55 from lp.services.config import dbconfig