[Checkins] SVN: zope.app.tree/trunk/ Cleanup dependencies, remove obsolete stuff. Change __used_for__ to component.adapts calls.
Dan Korostelev
nadako at gmail.com
Sat Jan 17 11:14:21 EST 2009
Log message for revision 94797:
Cleanup dependencies, remove obsolete stuff. Change __used_for__ to component.adapts calls.
Changed:
U zope.app.tree/trunk/CHANGES.txt
U zope.app.tree/trunk/buildout.cfg
U zope.app.tree/trunk/setup.py
D zope.app.tree/trunk/src/zope/app/tree/SETUP.cfg
U zope.app.tree/trunk/src/zope/app/tree/adapters.py
U zope.app.tree/trunk/src/zope/app/tree/browser/__init__.py
U zope.app.tree/trunk/src/zope/app/tree/browser/configure.zcml
U zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
U zope.app.tree/trunk/src/zope/app/tree/browser/tests.py
U zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py
D zope.app.tree/trunk/src/zope/app/tree/tree-configure.zcml
D zope.app.tree/trunk/src/zope/app/tree/version.txt
-=-
Modified: zope.app.tree/trunk/CHANGES.txt
===================================================================
--- zope.app.tree/trunk/CHANGES.txt 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/CHANGES.txt 2009-01-17 16:14:21 UTC (rev 94797)
@@ -2,6 +2,25 @@
CHANGES
=======
+3.5.0 (unreleased)
+------------------
+
+- Get rid of zope.app.zapi dependency, replacing its uses with
+ direct imports.
+
+- Clean up dependencies, move testing and rotterdam dependencies
+ to extra requires.
+
+- Fix mailing list address to zope-dev at zope.org instead of retired
+ zope3-dev at zope.org. Change `cheeseshop` to `pypi` in the package
+ url.
+
+- Replace __used_for__ in adapters.py with zope.component.adapts
+ calls to make more sense.
+
+- Remove obsolete zpkg files, zcml include file for mkzopeinstance-based
+ installations, versions.txt that makes no sense now.
+
3.4.0 (2007-10-28)
------------------
Modified: zope.app.tree/trunk/buildout.cfg
===================================================================
--- zope.app.tree/trunk/buildout.cfg 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/buildout.cfg 2009-01-17 16:14:21 UTC (rev 94797)
@@ -4,4 +4,5 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.app.tree
+eggs = zope.app.tree [skin,test]
+
Modified: zope.app.tree/trunk/setup.py
===================================================================
--- zope.app.tree/trunk/setup.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/setup.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -22,9 +22,9 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(name = 'zope.app.tree',
- version = '3.5.0',
+ version = '3.5.0dev',
author='Zope Corporation and Contributors',
- author_email='zope3-dev at zope.org',
+ author_email='zope-dev at zope.org',
description='Static Tree Implementation',
long_description=(
read('README.txt')
@@ -47,25 +47,22 @@
'Operating System :: OS Independent',
'Topic :: Internet :: WWW/HTTP',
'Framework :: Zope3'],
- url='http://cheeseshop.python.org/pypi/zope.app.tree',
+ url='http://pypi.python.org/pypi/zope.app.tree',
license='ZPL 2.1',
packages=find_packages('src'),
package_dir = {'': 'src'},
namespace_packages=['zope', 'zope.app'],
+ extras_require={'test': ['zope.app.testing'],
+ 'skin': ['zope.app.rotterdam']
+ },
install_requires = ['setuptools',
- 'zope.app.component',
'zope.app.container',
- 'zope.app.folder',
- 'zope.app.rotterdam',
- 'zope.app.skins',
- 'zope.app.testing',
'zope.component',
'zope.interface',
'zope.location',
'zope.publisher',
'zope.schema',
'zope.security',
- 'zope.testing',
'zope.traversing',
],
include_package_data = True,
Deleted: zope.app.tree/trunk/src/zope/app/tree/SETUP.cfg
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/SETUP.cfg 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/SETUP.cfg 2009-01-17 16:14:21 UTC (rev 94797)
@@ -1,5 +0,0 @@
-# Tell zpkg how to install the ZCML slugs.
-
-<data-files zopeskel/etc/package-includes>
- tree-*.zcml
-</data-files>
Modified: zope.app.tree/trunk/src/zope/app/tree/adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/adapters.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/adapters.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -21,20 +21,20 @@
$Id$
"""
from zope.interface import Interface, implements
+from zope.component import adapts
from zope.component.interfaces import ComponentLookupError
from zope.security import canAccess
from zope.security.interfaces import Unauthorized
-from zope.location.interfaces import ILocation
+from zope.location.interfaces import ILocation, ISite
from zope.traversing.api import getParents
from zope.app.container.interfaces import IReadContainer
-from zope.app.component.interfaces import ISite
from zope.app.tree.interfaces import IUniqueId, IChildObjects
class StubUniqueId(object):
implements(IUniqueId)
- __used_for__ = Interface
+ adapts(Interface)
def __init__(self, context):
self.context = context
@@ -45,7 +45,7 @@
class StubChildObjects(object):
implements(IChildObjects)
- __used_for__ = Interface
+ adapts(Interface)
def __init__(self, context):
pass
@@ -58,7 +58,7 @@
class LocationUniqueId(object):
implements(IUniqueId)
- __used_for__ = ILocation
+ adapts(ILocation)
def __init__(self, context):
self.context = context
@@ -75,7 +75,7 @@
class ContainerChildObjects(object):
implements(IChildObjects)
- __used_for__ = IReadContainer
+ adapts(IReadContainer)
def __init__(self, context):
self.context = context
@@ -101,7 +101,7 @@
"""Adapter for read containers which are sites as well. The site
manager will be treated as just another child object.
"""
- __used_for__ = ISite
+ adapts(ISite)
def hasChildren(self):
if super(ContainerSiteChildObjects, self).hasChildren():
Modified: zope.app.tree/trunk/src/zope/app/tree/browser/__init__.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/__init__.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/__init__.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -23,19 +23,15 @@
from zope.app.tree.interfaces import ITreeStateEncoder
from zope.app.tree.node import Node
-from zope.app.rotterdam import Rotterdam
class IStaticTreeLayer(IBrowserRequest):
"""Layer that we can register our own navigation macro for."""
-class IStaticTreeSkin(IStaticTreeLayer, Rotterdam):
- """Skin based on Rotterdam that includes the static tree
- navigation macro."""
-
-# BBB 2006/02/18, to be removed after 12 months
-try:
- import zope.app.skins
- zope.app.skins.set('StaticTree', IStaticTreeSkin)
+try: # we try not to depend on zope.app.rotterdam hardly
+ from zope.app.rotterdam import Rotterdam
+ class IStaticTreeSkin(IStaticTreeLayer, Rotterdam):
+ """Skin based on Rotterdam that includes the static tree
+ navigation macro."""
except ImportError:
pass
Modified: zope.app.tree/trunk/src/zope/app/tree/browser/configure.zcml
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/configure.zcml 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/configure.zcml 2009-01-17 16:14:21 UTC (rev 94797)
@@ -42,15 +42,8 @@
<!-- Set up the 'StaticTree' skin -->
- <!-- BBB 2006/02/18, to be removed after 12 months -->
- <browser:layer
- zcml:condition="have deprecatedlayers"
- interface=".IStaticTreeLayer"
- name="statictree"
- bbb_aware="true"
- />
-
<interface
+ zcml:condition="installed zope.app.rotterdam"
interface=".IStaticTreeSkin"
type="zope.publisher.interfaces.browser.IBrowserSkinType"
name="StaticTree"
Modified: zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/cookie.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -18,10 +18,9 @@
import zope.traversing.api
from zope.traversing.interfaces import IContainmentRoot
from zope.component.interfaces import IComponentLookup
+from zope.location.interfaces import ISite
from zope.app.container.interfaces import IContainer
-from zope.app.folder.interfaces import IFolder
-from zope.app.component.interfaces import ISite
from zope.app.tree.filters import OnlyInterfacesFilter
from zope.app.tree.browser import StatefulTreeView
Modified: zope.app.tree/trunk/src/zope/app/tree/browser/tests.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/browser/tests.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/browser/tests.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -22,9 +22,9 @@
from zope.publisher.browser import TestRequest
from zope.interface import alsoProvides
from zope.traversing.interfaces import IContainmentRoot
+from zope.location.interfaces import ISite
from zope.location.traversing import LocationPhysicallyLocatable
from zope.app.testing import ztapi
-from zope.app.component.interfaces import ISite
from zope.app.tree.utils import TreeStateEncoder
from zope.app.tree.browser import StatefulTreeView
Modified: zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/tests/test_adapters.py 2009-01-17 16:14:21 UTC (rev 94797)
@@ -22,9 +22,8 @@
from zope.security.checker import defineChecker
from zope.security.checker import NamesChecker
from zope.traversing.interfaces import IContainmentRoot
-from zope.location.interfaces import ILocation
+from zope.location.interfaces import ILocation, ISite
-from zope.app.component.interfaces import ISite
from zope.app.container.interfaces import IReadContainer
from zope.app.container.sample import SampleContainer
from zope.app.container.contained import setitem
Deleted: zope.app.tree/trunk/src/zope/app/tree/tree-configure.zcml
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/tree-configure.zcml 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/tree-configure.zcml 2009-01-17 16:14:21 UTC (rev 94797)
@@ -1 +0,0 @@
-<include package="zope.app.tree"/>
Deleted: zope.app.tree/trunk/src/zope/app/tree/version.txt
===================================================================
--- zope.app.tree/trunk/src/zope/app/tree/version.txt 2009-01-17 15:34:05 UTC (rev 94796)
+++ zope.app.tree/trunk/src/zope/app/tree/version.txt 2009-01-17 16:14:21 UTC (rev 94797)
@@ -1 +0,0 @@
-ZopeTree 1.2
\ No newline at end of file
More information about the Checkins
mailing list