[Zope3-checkins] CVS: Zope3/src/zope/proxy/context/tests - test_containmentiterator.py:1.1.2.2 test_simplemethodwrapper.py:1.1.2.4 test_wrapper.py:1.1.2.3
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:44 -0500
Update of /cvs-repository/Zope3/src/zope/proxy/context/tests
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zope/proxy/context/tests
Modified Files:
Tag: NameGeddon-branch
test_containmentiterator.py test_simplemethodwrapper.py
test_wrapper.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zope/proxy/context/tests/test_containmentiterator.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/proxy/context/tests/test_containmentiterator.py:1.1.2.1 Mon Dec 23 14:33:06 2002
+++ Zope3/src/zope/proxy/context/tests/test_containmentiterator.py Tue Dec 24 21:21:13 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""
@@ -35,7 +35,7 @@
def testUnWrapped(self):
self.assertEqual(map(getbaseobject, ContainmentIterator(9)), [ 9 ])
-
+
def test_suite():
loader=unittest.TestLoader()
return loader.loadTestsFromTestCase(Test)
=== Zope3/src/zope/proxy/context/tests/test_simplemethodwrapper.py 1.1.2.3 => 1.1.2.4 ===
--- Zope3/src/zope/proxy/context/tests/test_simplemethodwrapper.py:1.1.2.3 Mon Dec 23 18:52:38 2002
+++ Zope3/src/zope/proxy/context/tests/test_simplemethodwrapper.py Tue Dec 24 21:21:13 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import sys
import unittest
@@ -18,7 +18,7 @@
# and that SimpleMethodWrapper is available as
# from zope.proxy.context import Wrapper
#
-# However, this test suite can form the basis of a test for the improved C
+# However, this test suite can form the basis of a test for the improved C
# implementation, when that lands.
#
from zope.proxy.context import \
@@ -100,8 +100,8 @@
def this_is_any_old_method(self):
return 'base', self
-
-
+
+
class ClassicClass:
result = None
@@ -154,7 +154,7 @@
value = object()
self.assertEqual(self.wrapped.thisIsAContextMethod(value), value)
self.assert_(self.obj.result is self.wrapped)
-
+
self.assertEqual(self.obj.thisIsAContextMethod(value), value)
self.assert_(self.obj.result is self.obj)
@@ -235,7 +235,7 @@
def testNotFound(self):
self.assertRaises(AttributeError,
getattr, self.wrapped, 'noSuchAttribute')
-
+
class TestNewStyleClassWithSlots(TestClassicClass):
@@ -275,7 +275,7 @@
def this_is_any_old_method(self):
return 'sub', self
-
+
Sub = type('sub', (self._class, ), {
'this_is_any_old_method': this_is_any_old_method,
})
@@ -313,7 +313,7 @@
result_obj, result_value = self.wrapped.result
self.assert_(result_obj is self.wrapped)
self.assert_(result_value is value)
-
+
class SimpleClass(object):
pass
@@ -343,7 +343,7 @@
class TestWrapperTypeSelection(unittest.TestCase):
def testSelection(self):
-
+
from zope.proxy.context \
import SimpleMethodWrapper, SimpleCallableMethodWrapper, \
SimpleGetitemMethodWrapper, SimpleCallableGetitemMethodWrapper
@@ -449,4 +449,3 @@
result = runner.run(test_suite())
newerrs = len(result.errors) + len(result.failures)
sys.exit(newerrs and 1 or 0)
-
=== Zope3/src/zope/proxy/context/tests/test_wrapper.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zope/proxy/context/tests/test_wrapper.py:1.1.2.2 Mon Dec 23 15:17:48 2002
+++ Zope3/src/zope/proxy/context/tests/test_wrapper.py Tue Dec 24 21:21:13 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import pickle
import unittest