diff options
| author | Brian Sutherland <brian@vanguardistas.net> | 2009-04-10 15:05:02 +0000 |
|---|---|---|
| committer | Brian Sutherland <brian@vanguardistas.net> | 2009-04-10 15:05:02 +0000 |
| commit | e2e12dc280e94bb8f65fecdfe417c3bded9239e4 (patch) | |
| tree | e3d46062936522d6edd655acb289df96071d4264 /src | |
| parent | c3b0bc7aab2d68627005fd5548b4933fa42bc486 (diff) | |
| download | zope-security-e2e12dc280e94bb8f65fecdfe417c3bded9239e4.tar.gz | |
revert 99070
Diffstat (limited to 'src')
| -rw-r--r-- | src/zope/security/checker.py | 7 | ||||
| -rw-r--r-- | src/zope/security/tests/test_standard_checkers.py | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/zope/security/checker.py b/src/zope/security/checker.py index 9af7781..603c37d 100644 --- a/src/zope/security/checker.py +++ b/src/zope/security/checker.py @@ -624,13 +624,6 @@ BasicTypes = BasicTypes({ type(pytz.UTC): NoProxy, }) -try: - # NOTE: remove try/except when we depend on python2.5 and up. uuid in standard library from python 2.5. - from uuid import UUID - BasicTypes[UUID] = NoProxy -except ImportError: - pass - # Available for tests. Located here so it can be kept in sync with BasicTypes. BasicTypes_examples = { object: object(), diff --git a/src/zope/security/tests/test_standard_checkers.py b/src/zope/security/tests/test_standard_checkers.py index 9c11f90..3c33948 100644 --- a/src/zope/security/tests/test_standard_checkers.py +++ b/src/zope/security/tests/test_standard_checkers.py @@ -424,14 +424,6 @@ def test_rocks(): >>> from pytz import UTC >>> int(type(ProxyFactory( UTC )) is type(UTC)) 1 - - >>> try: - ... # NOTE: remove try/except when we depend on python 2.5 and greater (uuid in standard library) - ... from uuid import UUID - ... int(type(ProxyFactory( UUID('12345678123456781234567812345678') )) is UUID) - ... except ImportError: - ... 1 - 1 """ def test_iter_of_sequences(): |