[Checkins] SVN: z3c.jbot/trunk/ Prefer zope.site over zope.app.component if it is available and clean out buildout to be able to run all tests
Hanno Schlichting
hannosch at hannosch.eu
Wed Feb 17 07:46:44 EST 2010
Log message for revision 109090:
Prefer zope.site over zope.app.component if it is available and clean out buildout to be able to run all tests
Changed:
U z3c.jbot/trunk/CHANGES.txt
U z3c.jbot/trunk/buildout.cfg
U z3c.jbot/trunk/setup.py
U z3c.jbot/trunk/z3c/jbot/tests/test_five.py
U z3c.jbot/trunk/z3c/jbot/utility.py
-=-
Modified: z3c.jbot/trunk/CHANGES.txt
===================================================================
--- z3c.jbot/trunk/CHANGES.txt 2010-02-17 10:34:35 UTC (rev 109089)
+++ z3c.jbot/trunk/CHANGES.txt 2010-02-17 12:46:44 UTC (rev 109090)
@@ -1,6 +1,11 @@
Changes
=======
+0.6.2 (unreleased)
+------------------
+
+- Prefer zope.site over zope.app.component if it is available. [hannosch]
+
0.6.1 (2010-02-09)
------------------
Modified: z3c.jbot/trunk/buildout.cfg
===================================================================
--- z3c.jbot/trunk/buildout.cfg 2010-02-17 10:34:35 UTC (rev 109089)
+++ z3c.jbot/trunk/buildout.cfg 2010-02-17 12:46:44 UTC (rev 109090)
@@ -1,47 +1,9 @@
[buildout]
develop = .
parts = test
-versions = versions
[test]
recipe = zc.recipe.testrunner
-eggs = z3c.jbot
-
-[versions]
-ZODB3 = 3.8.1
-zope.annotation = 3.4.1
-zope.app.http = 3.5.1
-zope.app.i18n = 3.6.0
-zope.app.locales = 3.4.5
-zope.app.zcmlfiles = 3.5.3
-zope.app.publication = 3.5.3
-zope.app.publisher = 3.6.2
-zope.app.pagetemplate = 3.6.0
-zope.app.component = 3.6.1
-zope.app.container = 3.7.2
-zope.app.form = 3.7.3
-zope.app.folder = 3.5.1
-zope.app.security = 3.7.0
-zope.app.testing = 3.6.1
-zope.component = 3.6.0
-zope.configuration = 3.5.0
-zope.container = 3.7.2
-zope.deferredimport = 3.4.0
-zope.deprecation = 3.4.0
-zope.dottedname = 3.4.5
-zope.dublincore = 3.4.1
-zope.event = 3.4.0
-zope.exceptions = 3.5.2
-zope.hookable = 3.4.0
-zope.i18n = 3.7.0
-zope.i18nmessageid = 3.4.3
-zope.interface = 3.5.0
-zope.intid = 3.7.1
-zope.lifecycleevent = 3.5.2
-zope.location = 3.5.4
-zope.proxy = 3.5.0
-zope.publisher = 3.6.3
-zope.schema = 3.5.1
-zope.security = 3.6.2
-zope.site = 3.6.4
-zope.testing = 3.7.1
+eggs =
+ z3c.jbot
+ Zope2
Modified: z3c.jbot/trunk/setup.py
===================================================================
--- z3c.jbot/trunk/setup.py 2010-02-17 10:34:35 UTC (rev 109089)
+++ z3c.jbot/trunk/setup.py 2010-02-17 12:46:44 UTC (rev 109090)
@@ -1,5 +1,4 @@
from setuptools import setup, find_packages
-import sys, os
version = '0.6.2'
@@ -11,7 +10,6 @@
"Framework :: Zope2",
"Framework :: Zope3",
"Programming Language :: Python",
- "Topic :: Software Development :: Libraries :: Python Modules",
],
keywords='page template override',
author='Malthe Borch',
@@ -29,11 +27,8 @@
'zope.configuration',
'zope.security',
'zope.publisher',
- 'zope.app.component',
- # -*- Extra requirements: -*-
],
entry_points="""
- # -*- Entry points: -*-
[z3c.autoinclude.plugin]
target = plone
""",
Modified: z3c.jbot/trunk/z3c/jbot/tests/test_five.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/tests/test_five.py 2010-02-17 10:34:35 UTC (rev 109089)
+++ z3c.jbot/trunk/z3c/jbot/tests/test_five.py 2010-02-17 12:46:44 UTC (rev 109090)
@@ -25,7 +25,12 @@
class MockSite(object):
REQUEST = TestRequest("en")
getSiteManager = zope.component.getSiteManager
- from zope.app.component.hooks import setHooks, setSite
+
+ try:
+ from zope.site.hooks import setHooks, setSite
+ except ImportError:
+ from zope.app.component.hooks import setHooks, setSite
+
setHooks()
setSite(MockSite())
self._request = MockSite.REQUEST
Modified: z3c.jbot/trunk/z3c/jbot/utility.py
===================================================================
--- z3c.jbot/trunk/z3c/jbot/utility.py 2010-02-17 10:34:35 UTC (rev 109089)
+++ z3c.jbot/trunk/z3c/jbot/utility.py 2010-02-17 12:46:44 UTC (rev 109090)
@@ -1,7 +1,11 @@
from zope import interface
from zope import component
-from zope.app.component.hooks import getSite
+try:
+ from zope.site.hooks import getSite
+except ImportError:
+ from zope.app.component.hooks import getSite
+
from zope.publisher.interfaces import IRequest
import zope.security.management
More information about the checkins
mailing list