Here is the diff after running the syntactic check for modified files.
=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py 2010-01-18 16:54:07 +0000
+++ lib/canonical/launchpad/security.py 2010-01-20 20:29:00 +0000
@@ -469,7 +469,7 @@
return (user.inTeam(self.obj.person) or
user.isOneOf(
self.obj.specification,
- ['owner','drafter', 'assignee', 'approver']) or
+ ['owner', 'drafter', 'assignee', 'approver']) or
user.in_admin)
@@ -530,6 +530,7 @@
return True
return user.isOwner(self.obj.target)
+
class AdminMilestoneByLaunchpadAdmins(AuthorizationBase):
permission = 'launchpad.Admin'
usedfor = IMilestone
@@ -574,7 +575,7 @@
def checkAuthenticated(self, user):
"""Is the user a privileged team member or Launchpad staff?
-
+
Return true when the user is a member of Launchpad admins,
registry experts, team admins, or the team owners.
"""
@@ -1431,7 +1432,6 @@
# This code MUST match the logic in IBuildSet.getBuildsForBuilder()
# otherwise users are likely to get 403 errors, or worse.
-
def checkAuthenticated(self, user):
"""Private restricts to admins and archive members."""
if not self.obj.archive.private:
=== modified file 'lib/lp/translations/browser/configure.zcml'
--- lib/lp/translations/browser/configure.zcml 2009-12-12 05:47:41 +0000
+++ lib/lp/translations/browser/configure.zcml 2010-01-20 20:31:52 +0000
@@ -391,9 +391,9 @@
-
+
-
+
=== modified file 'lib/lp/translations/browser/potemplate.py'
--- lib/lp/translations/browser/potemplate.py 2010-01-20 20:16:29 +0000
+++ lib/lp/translations/browser/potemplate.py 2010-01-20 20:33:54 +0000
@@ -533,9 +533,8 @@
# We only change date_last_updated when the translation_domain
# field is changed because it is the only relevant field we
# care about regarding the date of last update.
- UTC = pytz.timezone('UTC')
naked_context = removeSecurityProxy(context)
- naked_context.date_last_updated = datetime.datetime.now(UTC)
+ naked_context.date_last_updated = datetime.datetime.now(pytz.UTC)
@property
def cancel_url(self):
=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml 2010-01-17 02:07:16 +0000
+++ lib/lp/translations/configure.zcml 2010-01-20 20:32:41 +0000
@@ -415,7 +415,7 @@
=== modified file 'lib/lp/translations/stories/standalone/xx-potemplate-edit.txt'
--- lib/lp/translations/stories/standalone/xx-potemplate-edit.txt 2010-01-20 20:16:29 +0000
+++ lib/lp/translations/stories/standalone/xx-potemplate-edit.txt 2010-01-20 20:32:18 +0000
@@ -109,7 +109,7 @@
The visible fields can be changed and saved.
>>> browser.getControl(name='field.translation_domain').value = u'evo'
- >>> browser.getControl(name='field.priority').value = '100'
+ >>> browser.getControl(name='field.priority').value = '100'
>>> browser.getControl(name='field.iscurrent').value = False
>>> browser.getControl(name='field.path').value = 'po/evolution.pot'
>>> browser.getControl(name='field.owner').value = u'name12'
@@ -127,7 +127,7 @@
>>> browser.getControl(name='field.translation_domain').value
'evo'
>>> browser.getControl(name='field.priority').value
- '100'
+ '100'
>>> browser.getControl(name='field.iscurrent').value
False
>>> browser.getControl(name='field.path').value