[Checkins] SVN: z3ext.controlpanel/trunk/ replace tabs with spaces
Nikolay Kim
fafhrd91 at gmail.com
Fri Jun 12 07:33:39 EDT 2009
Log message for revision 100897:
replace tabs with spaces
Changed:
U z3ext.controlpanel/trunk/buildout.cfg
U z3ext.controlpanel/trunk/setup.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/interfaces.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/interfaces.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/test_functional.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/wizard.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/configlettype.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests.py
U z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py
-=-
Modified: z3ext.controlpanel/trunk/buildout.cfg
===================================================================
--- z3ext.controlpanel/trunk/buildout.cfg 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/buildout.cfg 2009-06-12 11:33:39 UTC (rev 100897)
@@ -27,20 +27,8 @@
<configure i18n_domain="zope"
xmlns:zcml="http://namespaces.zope.org/zcml"
xmlns:browser="http://namespaces.zope.org/browser">
- <include package="zope.component" file="meta.zcml" />
- <include package="zope.viewlet" file="meta.zcml" />
- <include package="zope.app.component" file="meta.zcml" />
- <include package="zope.app.security" file="meta.zcml" />
- <include package="zope.app.pagetemplate" file="meta.zcml" />
-
- <include package="zope.contentprovider" />
- <include package="zope.app.security" />
- <include package="zope.app.zcmlfiles" />
- <include package="zope.app.authentication" />
-
- <include package="z3c.autoinclude" file="meta.zcml" />
- <include package="z3ext.controlpanel" file="meta.zcml" />
- <include package="z3ext.controlpanel" />
+ <include package="z3ext.autoinclude" file="meta.zcml" />
+ <includeAllDependencies package="z3ext.controlpanel" extras="test" />
</configure>
[i18nall]
Modified: z3ext.controlpanel/trunk/setup.py
===================================================================
--- z3ext.controlpanel/trunk/setup.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/setup.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -54,7 +54,7 @@
namespace_packages=['z3ext'],
install_requires = ['setuptools', 'ZODB3',
'zope.schema',
- 'zope.interface',
+ 'zope.interface',
'zope.component',
'zope.annotation',
'zope.security',
@@ -65,16 +65,16 @@
'zope.viewlet',
'zope.contentprovider',
'zope.cachedescriptors',
- 'zope.lifecycleevent',
+ 'zope.lifecycleevent',
'zope.configuration',
'zope.app.publisher',
'zope.app.component',
'zope.app.security',
- 'zope.app.container',
+ 'zope.app.container',
'z3c.traverser',
'z3ext.layout',
'z3ext.layoutform',
- 'z3ext.resourcepackage',
+ 'z3ext.resourcepackage',
],
extras_require = dict(test=['zope.securitypolicy',
'zope.app.security',
@@ -84,8 +84,8 @@
'zope.traversing',
'zope.testing',
'zope.testbrowser',
- 'z3ext.autoinclude',
- 'z3ext.security',
+ 'z3ext.autoinclude',
+ 'z3ext.security',
]),
include_package_data = True,
zip_safe = False
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/interfaces.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/interfaces.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/interfaces.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""
$Id$
"""
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/navigation.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -75,7 +75,7 @@
if configlet.__id__ == path[0].__id__:
info['items'] = self._process(configlet, path[1:], level+1)
-
+
if configlet.__id__ == self.context.__id__:
info['selected'] = True
info['items'] = self._process(configlet, [configlet], level+1)
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/interfaces.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/interfaces.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/interfaces.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""
$Id$
"""
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/test_functional.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/test_functional.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/tests/test_functional.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""
$Id$
"""
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/wizard.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/wizard.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/browser/wizard.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""
+"""
$Id$
"""
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/configlettype.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/configlettype.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/configlettype.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -33,7 +33,7 @@
>>> class IMyConfiglet(interface.Interface):
... title = schema.TextLine(title = u'Title')
-
+
>>> class MyConfiglet(object):
... pass
@@ -66,7 +66,7 @@
... pass
>>> ConfigletClass = configlettype.ConfigletType(
- ... 'myconfiglet', IMyConfiglet,
+ ... 'myconfiglet', IMyConfiglet,
... (MyConfiglet, MyConfiglet2), 'MyConfiglet', '')
"""
@@ -106,10 +106,10 @@
def __set__(self, inst, value):
raise AttributeError("Can't set __schema__")
-
+
class ConfigletProperty(object):
- """ Special property thats reads and writes values from
+ """ Special property thats reads and writes values from
instance's 'data' attribute
Let's define simple schema field
@@ -127,18 +127,18 @@
>>> class Content(object):
...
... attr1 = ConfigletProperty(field)
-
+
Lets create class instance and add field values storage
>>> ob = Content()
>>> ob.data = ConfigletData()
-
+
By default we should get field default value
>>> ob.attr1
u'default value'
- We can set only valid value
+ We can set only valid value
>>> ob.attr1 = 'value1'
Traceback (most recent call last):
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/storage.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -97,7 +97,7 @@
"""
-
+
interface.implements(IConfigletData, IAttributeAnnotatable)
def get(self, name, default=None):
@@ -167,7 +167,7 @@
@interface.implementer(IConfigletDataStorage)
def getConfigletDataStorage(siteManager):
sm = removeSecurityProxy(siteManager)
-
+
storage = sm.get('controlpanel', None)
if storage is None or not IConfigletDataStorage.providedBy(storage):
if storage is not None:
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/tests.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -18,7 +18,7 @@
__docformat__ = "reStructuredText"
import unittest, doctest
-from zope import interface, component
+from zope import interface, component
from zope.app.testing import setup
from zope.copypastemove import ObjectCopier
from zope.component.event import objectEventNotify
Modified: z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py
===================================================================
--- z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py 2009-06-12 11:01:28 UTC (rev 100896)
+++ z3ext.controlpanel/trunk/src/z3ext/controlpanel/zcml.py 2009-06-12 11:33:39 UTC (rev 100897)
@@ -63,12 +63,12 @@
required = False)
class_ = fields.GlobalObject(
- title = u"Class",
+ title = u"Class",
description = u'Custom configlet class',
- required = False)
+ required = False)
provides = fields.Tokens(
- title = u'Provides',
+ title = u'Provides',
required = False,
value_type = fields.GlobalInterface())
@@ -78,10 +78,10 @@
required = False)
tests = fields.Tokens(
- title = u"Tests",
+ title = u"Tests",
description = u'Tests for check availability.',
value_type = fields.GlobalObject(),
- required = False)
+ required = False)
class ConfigletDirective(object):
@@ -106,7 +106,7 @@
utility(_context, IConfiglet, configlet, name=name)
if install_schema_utility:
- utility(_context, schema, configlet)
+ utility(_context, schema, configlet)
interface.classImplements(ConfigletClass, schema, *provides)
@@ -180,7 +180,7 @@
"Set a permission on a bunch of names."
for name in names:
self._context.action(
- discriminator = ('z3ext:controlpanel:protectSetAttribute',
+ discriminator = ('z3ext:controlpanel:protectSetAttribute',
self._class, name, object()),
callable = protectSetAttribute,
args = (self._class, name, permission_id))
More information about the Checkins
mailing list