Commit 9d73c472 authored by Tres Seaver's avatar Tres Seaver

Merge AccessControl.User.tests.testUser fixes from 2.12, w/ LP#142536 fix.

parent 17dc97cb
...@@ -155,6 +155,8 @@ Features Added ...@@ -155,6 +155,8 @@ Features Added
Bugs Fixed Bugs Fixed
++++++++++ ++++++++++
- LP #142563: Fix ``AccessControl.User.NullUnrestrictedUserTests.__str__``.
- LP #267820: Fix bad except clause in the ``sequence_sort`` method of - LP #267820: Fix bad except clause in the ``sequence_sort`` method of
the ``<dtml-in>`` tag. the ``<dtml-in>`` tag.
......
...@@ -400,6 +400,9 @@ class NullUnrestrictedUser(SpecialUser): ...@@ -400,6 +400,9 @@ class NullUnrestrictedUser(SpecialUser):
def has_permission(self, permission, object): def has_permission(self, permission, object):
return 0 return 0
def __str__(self):
# See https://bugs.launchpad.net/zope2/+bug/142563
return repr(self)
def readUserAccessFile(filename): def readUserAccessFile(filename):
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment