[Checkins] SVN: z3ext.preferences/trunk/ ztk support
Nikolay Kim
fafhrd91 at gmail.com
Wed Dec 2 00:51:07 EST 2009
Log message for revision 106156:
ztk support
Changed:
U z3ext.preferences/trunk/CHANGES.txt
U z3ext.preferences/trunk/setup.py
U z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
U z3ext.preferences/trunk/src/z3ext/preferences/browser/preferences.py
U z3ext.preferences/trunk/src/z3ext/preferences/publisher.py
U z3ext.preferences/trunk/src/z3ext/preferences/roles.py
U z3ext.preferences/trunk/src/z3ext/preferences/root.py
U z3ext.preferences/trunk/src/z3ext/preferences/storage.py
U z3ext.preferences/trunk/src/z3ext/preferences/tests/README.txt
U z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
U z3ext.preferences/trunk/src/z3ext/preferences/tests/testlayout.pt
U z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py
U z3ext.preferences/trunk/src/z3ext/preferences/zcml.py
-=-
Modified: z3ext.preferences/trunk/CHANGES.txt
===================================================================
--- z3ext.preferences/trunk/CHANGES.txt 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/CHANGES.txt 2009-12-02 05:51:07 UTC (rev 106156)
@@ -2,6 +2,12 @@
CHANGES
=======
+1.6.0 (Unreleased)
+------------------
+
+- ZTK support
+
+
1.5.0 (2009-10-20)
------------------
Modified: z3ext.preferences/trunk/setup.py
===================================================================
--- z3ext.preferences/trunk/setup.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/setup.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -47,7 +47,7 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url='http://z3ext.net/',
+ url='http://pypi.python.org/pypi/z3ext.preferences/',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'':'src'},
@@ -69,11 +69,9 @@
'zope.i18nmessageid',
'zope.viewlet',
'zope.contentprovider',
- 'zope.app.security',
- 'zope.app.component',
- 'zope.app.publisher',
- 'zope.app.pagetemplate',
- 'zope.app.principalannotation',
+ 'zope.site',
+ 'zope.principalannotation',
+ 'zope.authentication',
'z3c.traverser',
'z3ext.layout',
'z3ext.layoutform',
@@ -84,7 +82,10 @@
'zope.testing',
'zope.testbrowser',
'zope.app.zcmlfiles',
+ 'z3c.breadcrumb',
'z3ext.autoinclude',
+ 'z3ext.authentication',
+ 'z3ext.ui.breadcrumbs',
]),
include_package_data = True,
zip_safe = False
Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/breadcrumb.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -30,7 +30,4 @@
@property
def name(self):
- name = self.context.__title__ or self.context.__id__
- if not name:
- name = _(u'Preferences')
- return name
+ return self.context.__title__ or self.context.__id__
Modified: z3ext.preferences/trunk/src/z3ext/preferences/browser/preferences.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/browser/preferences.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/browser/preferences.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -17,9 +17,9 @@
"""
from zope import interface, component
from zope.component import getUtility
-from zope.app.component.interfaces import ISite
+from zope.component.interfaces import ISite
from zope.security.interfaces import Unauthorized
-from zope.app.security.interfaces import IUnauthenticatedPrincipal
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
from z3ext.preferences.interfaces import IPreferenceGroup
Modified: z3ext.preferences/trunk/src/z3ext/preferences/publisher.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/publisher.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/publisher.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -30,11 +30,7 @@
def publishTraverse(self, request, name):
"""See zope.publisher.interfaces.IPublishTraverse"""
- try:
- subob = self.context.get(name, None)
- except:
- subob = None
-
+ subob = self.context.get(name, None)
if subob is None:
raise NotFound(self.context, name, request)
Modified: z3ext.preferences/trunk/src/z3ext/preferences/roles.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/roles.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/roles.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -16,7 +16,7 @@
$Id$
"""
from zope import interface, component
-from zope.app.security.settings import Allow, Unset
+from zope.securitypolicy.settings import Allow, Unset
from zope.securitypolicy.interfaces import IPrincipalRoleMap
from interfaces import IBound
Modified: z3ext.preferences/trunk/src/z3ext/preferences/root.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/root.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/root.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -16,8 +16,8 @@
$Id$
"""
from zope import interface
-from zope.app.component.hooks import getSite
-from zope.app.security.interfaces import IUnauthenticatedPrincipal
+from zope.site.hooks import getSite
+from zope.authentication.interfaces import IUnauthenticatedPrincipal
from preference import PreferenceGroup
from interfaces import _, IBound, IRootPreferences, IPreferenceCategory
Modified: z3ext.preferences/trunk/src/z3ext/preferences/storage.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/storage.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/storage.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -22,8 +22,8 @@
from zope.security.proxy import removeSecurityProxy
from zope.security.interfaces import IPrincipal
from zope.annotation.interfaces import IAnnotations
-from zope.app.principalannotation import PrincipalAnnotationUtility
-from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
+from zope.principalannotation.utility import PrincipalAnnotationUtility
+from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
from interfaces import ANNOTATION_KEY, IDataStorage, IPreferenceGroup
@@ -34,7 +34,7 @@
ann = IAnnotations(principal)
# If no preferences exist, create the root preferences object.
- if ann.get(ANNOTATION_KEY) is None:
+ if ann.get(ANNOTATION_KEY) is None:
ann[ANNOTATION_KEY] = OOBTree()
prefs = ann[ANNOTATION_KEY]
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/README.txt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/README.txt 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/README.txt 2009-12-02 05:51:07 UTC (rev 106156)
@@ -16,7 +16,7 @@
>>> from zope.app.testing import setup
>>> import zope.app.component.hooks
- >>> zope.app.component.hooks.setHooks()
+ >>> zope.component.hooks.setHooks()
>>> setup.setUpTraversal()
>>> setup.setUpSiteManagerLookup()
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/testbrowser.txt 2009-12-02 05:51:07 UTC (rev 106156)
@@ -7,6 +7,7 @@
>>> from zope.security.management import newInteraction, endInteraction
>>> from zope.app.security.interfaces import IAuthentication
>>> from zope.securitypolicy.interfaces import IPrincipalRoleMap
+ >>> from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
>>> from z3ext.preferences.tests.interfaces import IPrefs1
>>> root = getRootFolder()
@@ -134,18 +135,21 @@
<div class="z-form-field">
<label for="category-widgets-category" title="">Category</label>
<div class="z-form-help"></div>
- <div><input type="text" id="category-widgets-category"
+ <div>
+ <input id="category-widgets-category"
name="category.widgets.category"
- class="text-widget textline-field" value="" />
+ class="text-widget textline-field" value=""
+ type="text" />
</div>
</div>
</div>
<div class="z-form-controls">
<span>
<hr />
- <input type="submit" id="category-buttons-save"
+ <input id="category-buttons-save"
name="category.buttons.save"
- class="z-form-savebutton button-field" value="Save" />
+ class="z-form-savebutton button-field" value="Save"
+ type="submit" />
</span>
</div>
</form></div><div class="z-form">
@@ -165,3 +169,21 @@
Traceback (most recent call last):
...
NotFound: Object: ... name: u'unknown'
+
+
+If we remove principal all principal data should be removed also
+
+ >>> setSite(root)
+ >>> util = component.getUtility(IPrincipalAnnotationUtility)
+
+ >>> util.hasAnnotations(principal)
+ True
+
+ >>> from z3ext.authentication.interfaces import PrincipalRemovingEvent
+
+ >>> event.notify(PrincipalRemovingEvent(principal))
+
+ >>> util.hasAnnotations(principal)
+ False
+
+ >>> setSite(None)
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/testlayout.pt
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/testlayout.pt 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/testlayout.pt 2009-12-02 05:51:07 UTC (rev 106156)
@@ -1,5 +1,7 @@
<html>
<body>
+ <div tal:define="context nocall:maincontext"
+ tal:content="structure provider:portal.breadcrumbs"></div>
<div tal:content="structure provider:statusMessage"></div>
<div tal:content="structure view/render"></div>
Modified: z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/tests/tests.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -23,9 +23,10 @@
from zope.app.testing import setup, functional
from zope.app.rotterdam import Rotterdam
-from zope.app.principalannotation import PrincipalAnnotationUtility
-from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility
+from zope.principalannotation.utility import PrincipalAnnotationUtility
+from zope.principalannotation.interfaces import IPrincipalAnnotationUtility
from z3ext.layoutform.interfaces import ILayoutFormLayer
+from z3ext.preferences.storage import principalRemovingHandler
class IDefaultSkin(ILayoutFormLayer, Rotterdam):
Modified: z3ext.preferences/trunk/src/z3ext/preferences/zcml.py
===================================================================
--- z3ext.preferences/trunk/src/z3ext/preferences/zcml.py 2009-12-02 04:08:40 UTC (rev 106155)
+++ z3ext.preferences/trunk/src/z3ext/preferences/zcml.py 2009-12-02 05:51:07 UTC (rev 106156)
@@ -18,24 +18,21 @@
from zope import interface
from zope.schema import Int
from zope.component import getUtility, queryUtility, getGlobalSiteManager
+from zope.component.zcml import utility, adapter
+from zope.component.interface import provideInterface
from zope.schema.interfaces import IField
from zope.location.interfaces import ILocation
+from zope.interface.common.mapping import IEnumerableMapping
from zope.security.zcml import Permission
from zope.security.checker import Checker, CheckerPublic
from zope.security.interfaces import IPrincipal
+from zope.security.protectclass import \
+ protectName, protectSetAttribute, protectLikeUnto
-from zope.interface.common.mapping import IEnumerableMapping
-
-from zope.component.zcml import utility, adapter
-from zope.component.interface import provideInterface
-
from zope.configuration import fields
from zope.configuration.exceptions import ConfigurationError
-from zope.app.security.protectclass import \
- protectName, protectSetAttribute, protectLikeUnto
-
from preference import PreferenceGroup
from interfaces import IPreferenceGroup
from preferencetype import PreferenceType
More information about the checkins
mailing list