Merge lp:~mwhudson/launchpad/i-dont-believe-for-a-minute-that-steveIsFixingThis into lp:launchpad

Proposed by Michael Hudson-Doyle
Status: Merged
Approved by: William Grant
Approved revision: no longer in the source branch.
Merged at revision: 14137
Proposed branch: lp:~mwhudson/launchpad/i-dont-believe-for-a-minute-that-steveIsFixingThis
Merge into: lp:launchpad
Diff against target: 26 lines (+0/-8)
1 file modified
lib/canonical/launchpad/webapp/authorization.py (+0/-8)
To merge this branch: bzr merge lp:~mwhudson/launchpad/i-dont-believe-for-a-minute-that-steveIsFixingThis
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+79047@code.launchpad.net

Commit message

[r=wgrant][no-qa] Remove the 'steveIsFixingThis' cruft that was old when I started with Canonical, 4.5 years ago

Description of the change

Steve is not fixing this.

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

Tempting to defer to SteveA, but perhaps not.

review: Approve (code)
Revision history for this message
Francis J. Lacoste (flacoste) wrote :

The truth of this is that this is already fixed... on the mythical DVD that also has the implementation for crowd control ;-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/canonical/launchpad/webapp/authorization.py'
--- lib/canonical/launchpad/webapp/authorization.py 2011-04-27 16:01:06 +0000
+++ lib/canonical/launchpad/webapp/authorization.py 2011-10-12 01:11:28 +0000
@@ -41,9 +41,6 @@
41from lp.app.interfaces.security import IAuthorization41from lp.app.interfaces.security import IAuthorization
4242
4343
44steveIsFixingThis = False
45
46
47LAUNCHPAD_SECURITY_POLICY_CACHE_KEY = 'launchpad.security_policy_cache'44LAUNCHPAD_SECURITY_POLICY_CACHE_KEY = 'launchpad.security_policy_cache'
4845
4946
@@ -190,12 +187,7 @@
190 # This check shouldn't be needed, strictly speaking.187 # This check shouldn't be needed, strictly speaking.
191 # However, it is here as a "belt and braces".188 # However, it is here as a "belt and braces".
192189
193 # XXX Steve Alexander 2005-01-12:
194 # This warning should apply to the policy in zope3 also.
195 if permission == 'zope.Public':190 if permission == 'zope.Public':
196 if steveIsFixingThis:
197 warnings.warn(
198 'zope.Public being used raw on object %r' % object)
199 return True191 return True
200 if permission is CheckerPublic:192 if permission is CheckerPublic:
201 return True193 return True