[Zope-Checkins] CVS: Packages/ZPublisher/tests -
testBaseRequest.py:1.1.6.2.10.3
Sidnei da Silva
sidnei at awkly.org
Wed Oct 6 15:03:11 EDT 2004
Update of /cvs-repository/Packages/ZPublisher/tests
In directory cvs.zope.org:/tmp/cvs-serv27768/lib/python/ZPublisher/tests
Modified Files:
Tag: dc-bobo_traverse-branch
testBaseRequest.py
Log Message:
Remove fallback on __bobo_traverse__ failure, as discussed with Chris McDonough.
=== Packages/ZPublisher/tests/testBaseRequest.py 1.1.6.2.10.2 => 1.1.6.2.10.3 ===
--- Packages/ZPublisher/tests/testBaseRequest.py:1.1.6.2.10.2 Mon Oct 4 16:50:17 2004
+++ Packages/ZPublisher/tests/testBaseRequest.py Wed Oct 6 15:03:10 2004
@@ -59,17 +59,6 @@
def __bobo_traverse__(self, REQUEST, name):
raise AttributeError, name
- def dummyMethod(self):
- """Dummy method with docstring."""
- return 'Dummy Value'
-
- def __getitem__(self, name):
- if name.startswith('no_key_'):
- raise KeyError, name
- name = name.replace('key_', '')
- return getattr(self, name)
-
-
class DummyObjectWithBD(DummyObjectBasic):
""" Dummy class with docstring.
"""
@@ -86,7 +75,7 @@
"""
def __bobo_traverse__(self, REQUEST, name):
- if name == self.default_path[0]:
+ if name == self._default_path[0]:
return getattr(self, name)
raise AttributeError, name
@@ -176,28 +165,6 @@
r = self.makeBaseRequest()
self.failUnlessRaises(NotFound, r.traverse, 'folder/objWithBBT/bbt_foo')
- def test_traverse_withBBT_fallback_getattr(self):
- # Test that if __bobo_traverse__ raises AttributeError
- # that we fallback to getattr()
- r = self.makeBaseRequest()
- r.traverse('folder/objWithBBT/dummyMethod')
- self.assertEqual(r.URL, '/folder/objWithBBT/dummyMethod')
-
- def test_traverse_withBBT_fallback_getitem(self):
- # Test that if __bobo_traverse__ raises AttributeError
- # and getattr raises AttributeError
- # that we fallback to __getitem__
- r = self.makeBaseRequest()
- r.traverse('folder/objWithBBT/key_dummyMethod')
- self.assertEqual(r.URL, '/folder/objWithBBT/key_dummyMethod')
-
- def test_traverse_withBBT_fallback_getitem_NotFound(self):
- # Test that if all else fails, we get a NotFound
- from ZPublisher import NotFound
- r = self.makeBaseRequest()
- self.failUnlessRaises(NotFound, r.traverse,
- 'folder/objWithBBT/no_key_dummyMethod')
-
def test_traverse_withBDBBT(self):
# Test for an object which has a __browser_default__
# and __bobo_traverse__
@@ -213,7 +180,6 @@
# Test for an object which has a __browser_default__
# and __bobo_traverse__
# __bobo_traverse__ should raise an AttributeError, which will
- # end up falling back to getattr, then __getitem__ to finally
# raise a NotFound
from ZPublisher import NotFound
r = self.makeBaseRequest()
More information about the Zope-Checkins
mailing list