Launchpad itself

Merge ~cjwatson/launchpad:py3-io-security into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. py3-io-security
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 127cc05c88970dd92cbc3a3ca4610319130c11ee
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:py3-io-security
Merge into: launchpad:master
Diff against target: 31 lines (+0/-15)
2 files modified
dev/null (+0/-14)
lib/lp/services/webapp/configure.zcml (+0/-1)
Reviewer Review Type Date Requested Status
Thiago F. Pappacena (community) Approve
Review via email: mp+391037@code.launchpad.net

Commit message

Remove StringIO security declaration

Description of the change

This was rather fiddly to port to Python 3, but it seems to be unused: no tests fail after simply removing it instead. It seems likely that StringIO is never returned from security-proxied methods.

To post a comment you must log in.
Revision history for this message
Thiago F. Pappacena (pappacena) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/services/webapp/bug-5133.zcml b/lib/lp/services/webapp/bug-5133.zcml
2deleted file mode 100644
3index 9e5e048..0000000
4--- a/lib/lp/services/webapp/bug-5133.zcml
5+++ /dev/null
6@@ -1,14 +0,0 @@
7-<!-- Copyright 2009 Canonical Ltd. This software is licensed under the
8- GNU Affero General Public License version 3 (see the file LICENSE).
9--->
10-
11-<configure
12- xmlns="http://namespaces.zope.org/zope"
13- xmlns:i18n="http://namespaces.zope.org/i18n"
14- i18n_domain="launchpad">
15-
16- <class class="StringIO.StringIO">
17- <allow attributes="seek getvalue readlines read write writelines" />
18- </class>
19-</configure>
20-
21diff --git a/lib/lp/services/webapp/configure.zcml b/lib/lp/services/webapp/configure.zcml
22index bfbb9cb..95f495d 100644
23--- a/lib/lp/services/webapp/configure.zcml
24+++ b/lib/lp/services/webapp/configure.zcml
25@@ -10,7 +10,6 @@
26
27 <include file="servers.zcml" />
28 <include file="errorlog.zcml" />
29- <include file="bug-5133.zcml" />
30
31 <browser:defaultView name="index.html" />
32

Subscribers

People subscribed via source and target branches

to status/vote changes: