[Checkins] SVN: z3ext.skintool/trunk/ update tests
Nikolay Kim
fafhrd91 at gmail.com
Tue Dec 22 18:57:03 EST 2009
Log message for revision 106981:
update tests
Changed:
U z3ext.skintool/trunk/CHANGES.txt
U z3ext.skintool/trunk/setup.py
U z3ext.skintool/trunk/src/z3ext/skintool/skindatatype.py
U z3ext.skintool/trunk/src/z3ext/skintool/subscribers.py
U z3ext.skintool/trunk/src/z3ext/skintool/tests/ftesting.zcml
U z3ext.skintool/trunk/src/z3ext/skintool/tests/overrides.zcml
U z3ext.skintool/trunk/src/z3ext/skintool/tests/tests.py
U z3ext.skintool/trunk/src/z3ext/skintool/tool.py
-=-
Modified: z3ext.skintool/trunk/CHANGES.txt
===================================================================
--- z3ext.skintool/trunk/CHANGES.txt 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/CHANGES.txt 2009-12-22 23:57:03 UTC (rev 106981)
@@ -2,10 +2,12 @@
CHANGES
=======
-1.2.1 (Unreleased)
+1.3.0 (Unreleased)
------------------
+- ZTK support
+
1.2.0 (2009-08-11)
------------------
Modified: z3ext.skintool/trunk/setup.py
===================================================================
--- z3ext.skintool/trunk/setup.py 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/setup.py 2009-12-22 23:57:03 UTC (rev 106981)
@@ -21,7 +21,7 @@
def read(*rnames):
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
-version = '1.2.1dev'
+version = '0'
setup(name='z3ext.skintool',
@@ -47,7 +47,7 @@
'Framework :: Zope3'],
author='Nikolay Kim',
author_email='fafhrd91 at gmail.com',
- url='http://z3ext.net/',
+ url='http://pypi.python.org/pypi/z3ext.skintool/',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'':'src'},
@@ -60,19 +60,21 @@
'zope.security',
'zope.configuration',
'zope.lifecycleevent',
- 'zope.app.intid',
- 'zope.app.component',
- 'zope.app.publication',
+ 'zope.intid',
'zope.i18nmessageid',
'zope.i18n',
+ 'zope.site',
+ 'zope.container',
+ 'zope.app.generations',
+ 'z3ext.layoutform',
'z3ext.controlpanel',
'z3ext.widget.radio',
'z3ext.widget.checkbox',
],
extras_require = dict(test=['zope.app.testing',
- 'zope.app.zcmlfiles',
'zope.testing',
'zope.testbrowser',
+ 'zope.principalregistry',
'z3ext.autoinclude',
'z3ext.security',
]),
Modified: z3ext.skintool/trunk/src/z3ext/skintool/skindatatype.py
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/skindatatype.py 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/skindatatype.py 2009-12-22 23:57:03 UTC (rev 106981)
@@ -18,7 +18,7 @@
import sys
from zope.schema import getFields
from persistent import Persistent
-from zope.app.container.contained import Contained
+from zope.container.contained import Contained
from interfaces import _
from z3ext.controlpanel.storage import ConfigletData
Modified: z3ext.skintool/trunk/src/z3ext/skintool/subscribers.py
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/subscribers.py 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/subscribers.py 2009-12-22 23:57:03 UTC (rev 106981)
@@ -19,19 +19,20 @@
from zope.proxy import removeAllProxies
from zope.component import getUtility
from zope.interface import directlyProvides
-from zope.app.intid.interfaces import IIntIds
-from zope.app.component.interfaces import ISite
-from zope.app.publication.interfaces import IBeforeTraverseEvent
+from zope.intid.interfaces import IIntIds
+from zope.component.interfaces import ISite
+from zope.traversing.interfaces import IBeforeTraverseEvent
from tool import cache
from interfaces import ISkinTool, ISkinable, INoSkinSwitching
@component.adapter(ISite, IBeforeTraverseEvent)
-def threadServiceSubscriber(site, event,
- ISkinable = ISkinable,
- removeAllProxies=removeAllProxies,
- directlyProvides=directlyProvides):
+def threadServiceSubscriber(
+ site, event,
+ ISkinable = ISkinable,
+ removeAllProxies=removeAllProxies,
+ directlyProvides=directlyProvides):
if INoSkinSwitching.providedBy(event.request):
return
Modified: z3ext.skintool/trunk/src/z3ext/skintool/tests/ftesting.zcml
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/tests/ftesting.zcml 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/tests/ftesting.zcml 2009-12-22 23:57:03 UTC (rev 106981)
@@ -4,6 +4,9 @@
xmlns:browser="http://namespaces.zope.org/browser"
i18n_domain="zope">
+ <exclude package="zope.dublincore.browser" />
+ <exclude package="zope.app.generations.browser" />
+
<include package="z3ext.autoinclude" file="meta.zcml" />
<includeAllDependencies package="z3ext.skintool" extras="test" />
Modified: z3ext.skintool/trunk/src/z3ext/skintool/tests/overrides.zcml
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/tests/overrides.zcml 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/tests/overrides.zcml 2009-12-22 23:57:03 UTC (rev 106981)
@@ -6,7 +6,7 @@
<z3ext:layout
name="portal"
title="Test layout"
- for="zope.app.component.interfaces.ISite"
+ for="zope.component.interfaces.ISite"
template="testlayout.pt" />
</configure>
Modified: z3ext.skintool/trunk/src/z3ext/skintool/tests/tests.py
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/tests/tests.py 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/tests/tests.py 2009-12-22 23:57:03 UTC (rev 106981)
@@ -21,16 +21,16 @@
from zope.component import testing
from zope.testing import doctestunit
from zope.app.testing import setup, functional
-from zope.app.intid.interfaces import IIntIds
-from zope.app.intid import IntIds
-from zope.app.rotterdam import Rotterdam
+from zope.intid.interfaces import IIntIds
+from zope.intid import IntIds
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
+from z3ext.skintool.tool import SkinTool
from z3ext.controlpanel.testing import setUpControlPanel
from z3ext.layoutform.interfaces import ILayoutFormLayer
-from z3ext.skintool.tool import SkinTool
-class IDefaultSkin(ILayoutFormLayer, Rotterdam):
+class IDefaultSkin(ILayoutFormLayer, IDefaultBrowserLayer):
""" skin """
Modified: z3ext.skintool/trunk/src/z3ext/skintool/tool.py
===================================================================
--- z3ext.skintool/trunk/src/z3ext/skintool/tool.py 2009-12-22 23:56:52 UTC (rev 106980)
+++ z3ext.skintool/trunk/src/z3ext/skintool/tool.py 2009-12-22 23:57:03 UTC (rev 106981)
@@ -24,8 +24,8 @@
from zope.lifecycleevent.interfaces import IObjectModifiedEvent
from zope.publisher.interfaces.browser import \
IDefaultSkin, IBrowserRequest, IDefaultBrowserLayer
-from zope.app.component.hooks import getSite
-from zope.app.intid.interfaces import IIntIds
+from zope.site.hooks import getSite
+from zope.intid.interfaces import IIntIds
from z3ext.layoutform import Fields, PageletEditSubForm
from z3ext.controlpanel.browser.configlet import Configlet
More information about the checkins
mailing list