Ezio Melotti <[email protected]> added the comment:
BTW, there were two conflicts that might cause some problems, the first is in
cgi/client.py[0]:
Our copy:
# MvL 20100404: catch IndexError
try:
mime_type = klass.get(nodeid, 'type')
except IndexError:
raise NotFound, designator
Roundup 1.4.19:
mime_type = klass.get(nodeid, 'type')
# Can happen for msg class:
if not mime_type:
mime_type = 'text/plain'
Here I decided to use the roundup version.
The second is in cgi/templating.py[1]:
Our copy:
- def batch(self):
+ def batch(self, to_ignore='ignore'):
""" Return a batch object for results from the "current search"
"""
filterspec = self.filterspec
sort = self.sort
group = self.group
+ ignore = self.get_ignored(to_ignore)
Roundup 1.4.19:
- def batch(self):
+ def batch(self, permission='View'):
""" Return a batch object for results from the "current search"
"""
+ check = self._client.db.security.hasPermission
+ userid = self._client.userid
+ if not check('Web Access', userid):
+ return Batch(self.client, [], self.pagesize, self.startwith,
+ classname=self.classname)
Merge result:
def batch(self, permission='View', to_ignore='ignore'):
""" Return a batch object for results from the "current search"
"""
check = self._client.db.security.hasPermission
userid = self._client.userid
if not check('Web Access', userid):
return Batch(self.client, [], self.pagesize, self.startwith,
classname=self.classname)
filterspec = self.filterspec
sort = self.sort
group = self.group
ignore = self.get_ignored(to_ignore)
It's not clear from the code alone if these args are called by name (i.e. no
problems) or by position (might cause problems if to_ignore is called first),
so I'll have to do some testing.
[0]: http://svn.python.org/view?view=revision&revision=79749
[1]: http://svn.python.org/view?view=revision&revision=82976
----------
assignedto: -> ezio.melotti
_______________________________________________________
PSF Meta Tracker <[email protected]>
<http://psf.upfronthosting.co.za/roundup/meta/issue411>
_______________________________________________________
_______________________________________________
Tracker-discuss mailing list
[email protected]
http://mail.python.org/mailman/listinfo/tracker-discuss
