[Checkins] SVN: five.pt/trunk/src/five/pt/ zcml include Five, remove explicit loading from afterSetUps
Florian Friesdorf
flo at chaoflow.net
Wed Nov 2 00:16:47 UTC 2011
Log message for revision 123243:
zcml include Five, remove explicit loading from afterSetUps
Changed:
U five.pt/trunk/src/five/pt/configure.zcml
U five.pt/trunk/src/five/pt/tests/test_engine.py
U five.pt/trunk/src/five/pt/tests/test_pagetemplate.py
U five.pt/trunk/src/five/pt/tests/test_persistenttemplate.py
U five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py
-=-
Modified: five.pt/trunk/src/five/pt/configure.zcml
===================================================================
--- five.pt/trunk/src/five/pt/configure.zcml 2011-11-02 00:16:39 UTC (rev 123242)
+++ five.pt/trunk/src/five/pt/configure.zcml 2011-11-02 00:16:46 UTC (rev 123243)
@@ -2,6 +2,7 @@
xmlns="http://namespaces.zope.org/zope"
xmlns:five="http://namespaces.zope.org/five">
+ <include package="Products.Five" />
<include package="z3c.pt" />
<utility component=".engine.Program" />
Modified: five.pt/trunk/src/five/pt/tests/test_engine.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_engine.py 2011-11-02 00:16:39 UTC (rev 123242)
+++ five.pt/trunk/src/five/pt/tests/test_engine.py 2011-11-02 00:16:46 UTC (rev 123243)
@@ -9,12 +9,8 @@
class TestPatches(Sandboxed, ZopeTestCase):
def afterSetUp(self):
from Products.Five import zcml
- import Products.Five
- import z3c.pt
import five.pt
- zcml.load_config("configure.zcml", Products.Five)
zcml.load_config("configure.zcml", five.pt)
- zcml.load_config("configure.zcml", z3c.pt)
def test_pagetemplate(self):
from Products.PageTemplates.PageTemplate import PageTemplate
Modified: five.pt/trunk/src/five/pt/tests/test_pagetemplate.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_pagetemplate.py 2011-11-02 00:16:39 UTC (rev 123242)
+++ five.pt/trunk/src/five/pt/tests/test_pagetemplate.py 2011-11-02 00:16:46 UTC (rev 123243)
@@ -9,12 +9,8 @@
class TestPageTemplateFile(ZopeTestCase):
def afterSetUp(self):
from Products.Five import zcml
- import Products.Five
- import z3c.pt
import five.pt
- zcml.load_config("configure.zcml", Products.Five)
zcml.load_config("configure.zcml", five.pt)
- zcml.load_config("configure.zcml", z3c.pt)
def _makeOne(self, name):
return PageTemplateFile(os.path.join(path, name)).\
Modified: five.pt/trunk/src/five/pt/tests/test_persistenttemplate.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_persistenttemplate.py 2011-11-02 00:16:39 UTC (rev 123242)
+++ five.pt/trunk/src/five/pt/tests/test_persistenttemplate.py 2011-11-02 00:16:46 UTC (rev 123243)
@@ -104,12 +104,8 @@
class TestPersistent(ZopeTestCase):
def afterSetUp(self):
from Products.Five import zcml
- import Products.Five
- import z3c.pt
import five.pt
- zcml.load_config("configure.zcml", Products.Five)
zcml.load_config("configure.zcml", five.pt)
- zcml.load_config("configure.zcml", z3c.pt)
self.setRoles(['Manager'])
def _makeOne(self, template_id, source):
Modified: five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py
===================================================================
--- five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py 2011-11-02 00:16:39 UTC (rev 123242)
+++ five.pt/trunk/src/five/pt/tests/test_viewpagetemplatefile.py 2011-11-02 00:16:46 UTC (rev 123243)
@@ -37,12 +37,8 @@
class TestPageTemplateFile(ZopeTestCase):
def afterSetUp(self):
from Products.Five import zcml
- import Products.Five
- import z3c.pt
import five.pt
- zcml.load_config("configure.zcml", Products.Five)
zcml.load_config("configure.zcml", five.pt)
- zcml.load_config("configure.zcml", z3c.pt)
def test_simple(self):
view = SimpleView(self.folder, self.folder.REQUEST)
More information about the checkins
mailing list