[z3-checkins] r5189 - in z3/Five/trunk: . demo/FiveDemo security
tests tests/products/FiveTest
dreamcatcher at codespeak.net
dreamcatcher at codespeak.net
Mon Jun 21 02:19:26 MEST 2004
Author: dreamcatcher
Date: Mon Jun 21 02:19:25 2004
New Revision: 5189
Modified:
z3/Five/trunk/demo/FiveDemo/__init__.py
z3/Five/trunk/demo/FiveDemo/classes.py
z3/Five/trunk/metaclass.py
z3/Five/trunk/metadirectives.py
z3/Five/trunk/provideinterface.py
z3/Five/trunk/security/fields.py
z3/Five/trunk/tests/framework.py
z3/Five/trunk/tests/products/FiveTest/browser.py
z3/Five/trunk/tests/products/FiveTest/classes.py
z3/Five/trunk/tests/products/FiveTest/interfaces.py
z3/Five/trunk/tests/products/FiveTest/simplecontent.py
z3/Five/trunk/tests/test_five.py
z3/Five/trunk/tests/test_security.py
Log:
Reindent, just for the fun of it.
Modified: z3/Five/trunk/demo/FiveDemo/__init__.py
==============================================================================
--- z3/Five/trunk/demo/FiveDemo/__init__.py (original)
+++ z3/Five/trunk/demo/FiveDemo/__init__.py Mon Jun 21 02:19:25 2004
@@ -5,11 +5,11 @@
zcml.process('configure.zcml', package=Products.FiveDemo)
# after everything is configured, we can use adapters
-
+
from zope.component import getAdapter
from classes import MyClass
from interfaces import INewInterface
-
+
object = MyClass()
adapted = getAdapter(object, INewInterface)
print adapted.anotherMethod()
Modified: z3/Five/trunk/demo/FiveDemo/classes.py
==============================================================================
--- z3/Five/trunk/demo/FiveDemo/classes.py (original)
+++ z3/Five/trunk/demo/FiveDemo/classes.py Mon Jun 21 02:19:25 2004
@@ -6,12 +6,12 @@
def someMethod(self):
return "I am alive! Alive!"
-
+
class MyAdapter:
implements(INewInterface)
-
+
def __init__(self, context):
self.context = context
-
+
def anotherMethod(self):
return "We have adapted: %s" % self.context.someMethod()
Modified: z3/Five/trunk/metaclass.py
==============================================================================
--- z3/Five/trunk/metaclass.py (original)
+++ z3/Five/trunk/metaclass.py Mon Jun 21 02:19:25 2004
@@ -90,4 +90,3 @@
meta = tuple([getattr(b,'__class__',type(b)) for b in bases])
if meta==bases: raise TypeError("Incompatible root metatypes",bases)
return derivedMeta(meta)
-
Modified: z3/Five/trunk/metadirectives.py
==============================================================================
--- z3/Five/trunk/metadirectives.py (original)
+++ z3/Five/trunk/metadirectives.py Mon Jun 21 02:19:25 2004
@@ -139,4 +139,3 @@
class IDefinePermissionDirective(IBaseDefineDirective):
"""Define a new permission."""
-
Modified: z3/Five/trunk/provideinterface.py
==============================================================================
--- z3/Five/trunk/provideinterface.py (original)
+++ z3/Five/trunk/provideinterface.py Mon Jun 21 02:19:25 2004
@@ -33,6 +33,6 @@
directlyProvides(interface, iface_type)
else:
iface_type = IInterface
-
+
utilityService = getService(servicenames.Utilities)
utilityService.provideUtility(iface_type, interface, name=id)
Modified: z3/Five/trunk/security/fields.py
==============================================================================
--- z3/Five/trunk/security/fields.py (original)
+++ z3/Five/trunk/security/fields.py Mon Jun 21 02:19:25 2004
@@ -79,4 +79,3 @@
# rebuilt.
order=9999999,
)
-
Modified: z3/Five/trunk/tests/framework.py
==============================================================================
--- z3/Five/trunk/tests/framework.py (original)
+++ z3/Five/trunk/tests/framework.py Mon Jun 21 02:19:25 2004
@@ -1,6 +1,6 @@
##############################################################################
#
-# ZopeTestCase
+# ZopeTestCase
#
# COPY THIS FILE TO YOUR 'tests' DIRECTORY.
#
@@ -12,14 +12,14 @@
# instance's Products and lib/python directories respectively.
#
# If you explicitly set INSTANCE_HOME prior to running the tests,
-# auto-detection is disabled and the specified path will be used
+# auto-detection is disabled and the specified path will be used
# instead.
#
# If the 'tests' directory contains a custom_zodb.py file, INSTANCE_HOME
# will be adjusted to use it.
#
-# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup
-# is assumed, and you can attach to a running ZEO server (via the
+# If you set the ZEO_INSTANCE_HOME environment variable a ZEO setup
+# is assumed, and you can attach to a running ZEO server (via the
# instance's custom_zodb.py).
#
##############################################################################
@@ -85,7 +85,7 @@
sys.exit(1)
ztc_common = 'ztc_common.py'
- ztc_common_global = os.path.join(p, ztc_common)
+ ztc_common_global = os.path.join(p, ztc_common)
f = 0
if os.path.exists(ztc_common_global):
@@ -104,4 +104,3 @@
print 'SOFTWARE_HOME: %s' % os.environ.get('SOFTWARE_HOME', 'Not set')
print 'INSTANCE_HOME: %s' % os.environ.get('INSTANCE_HOME', 'Not set')
sys.stdout.flush()
-
Modified: z3/Five/trunk/tests/products/FiveTest/browser.py
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/browser.py (original)
+++ z3/Five/trunk/tests/products/FiveTest/browser.py Mon Jun 21 02:19:25 2004
@@ -10,6 +10,5 @@
def eagle(self):
"""Docstring"""
return "The eagle has landed"
-
-InitializeClass(SimpleContentView)
+InitializeClass(SimpleContentView)
Modified: z3/Five/trunk/tests/products/FiveTest/classes.py
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/classes.py (original)
+++ z3/Five/trunk/tests/products/FiveTest/classes.py Mon Jun 21 02:19:25 2004
@@ -6,12 +6,12 @@
def method(self):
return "The method"
-
+
class Adapter:
implements(IAdapted)
-
+
def __init__(self, context):
self.context = context
-
+
def adaptedMethod(self):
return "Adapted: %s" % self.context.method()
Modified: z3/Five/trunk/tests/products/FiveTest/interfaces.py
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/interfaces.py (original)
+++ z3/Five/trunk/tests/products/FiveTest/interfaces.py Mon Jun 21 02:19:25 2004
@@ -6,7 +6,7 @@
def method(self):
"""This method will be adapted
"""
-
+
class IAdapted(Interface):
"""The interface we adapt to.
"""
Modified: z3/Five/trunk/tests/products/FiveTest/simplecontent.py
==============================================================================
--- z3/Five/trunk/tests/products/FiveTest/simplecontent.py (original)
+++ z3/Five/trunk/tests/products/FiveTest/simplecontent.py Mon Jun 21 02:19:25 2004
@@ -10,14 +10,14 @@
class SimpleContent(SimpleItem, Viewable):
implements(ISimpleContent)
-
+
meta_type = 'TestSimpleContent'
security = ClassSecurityInfo()
def __init__(self, id, title):
self.id = id
self.title = title
-
+
security.declarePublic('mymethod')
def mymethod(self):
return "Hello world"
@@ -27,7 +27,7 @@
"""Should be able to traverse directly to this as there is no view.
"""
return "Direct traversal worked"
-
+
InitializeClass(SimpleContent)
manage_addSimpleContentForm = PageTemplateFile(
Modified: z3/Five/trunk/tests/test_five.py
==============================================================================
--- z3/Five/trunk/tests/test_five.py (original)
+++ z3/Five/trunk/tests/test_five.py Mon Jun 21 02:19:25 2004
@@ -104,4 +104,3 @@
if __name__ == '__main__':
framework()
-
Modified: z3/Five/trunk/tests/test_security.py
==============================================================================
--- z3/Five/trunk/tests/test_security.py (original)
+++ z3/Five/trunk/tests/test_security.py Mon Jun 21 02:19:25 2004
@@ -131,8 +131,8 @@
<deny attributes="baz" />
<require attributes="bar keg"
- permission="zope.ViewManagementScreens"
- />
+ permission="zope.ViewManagementScreens"
+ />
</five:content>
</configure>
@@ -176,4 +176,3 @@
if __name__ == '__main__':
framework()
-
More information about the z3-checkins
mailing list