[Checkins] SVN: zope.app.basicskin/trunk/ Avoid zope.app.component testing dependency.

Hanno Schlichting hannosch at hannosch.eu
Wed Dec 16 17:45:29 EST 2009


Log message for revision 106670:
  Avoid zope.app.component testing dependency.
  

Changed:
  U   zope.app.basicskin/trunk/CHANGES.txt
  U   zope.app.basicskin/trunk/setup.py
  U   zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py

-=-
Modified: zope.app.basicskin/trunk/CHANGES.txt
===================================================================
--- zope.app.basicskin/trunk/CHANGES.txt	2009-12-16 22:42:40 UTC (rev 106669)
+++ zope.app.basicskin/trunk/CHANGES.txt	2009-12-16 22:45:29 UTC (rev 106670)
@@ -5,6 +5,8 @@
 3.5.0 (unreleased)
 ------------------
 
+- Avoid zope.app.component testing dependency.
+
 - Removed BBB import for IBasicSkin.
 
 3.4.1 (2009-08-15)

Modified: zope.app.basicskin/trunk/setup.py
===================================================================
--- zope.app.basicskin/trunk/setup.py	2009-12-16 22:42:40 UTC (rev 106669)
+++ zope.app.basicskin/trunk/setup.py	2009-12-16 22:45:29 UTC (rev 106670)
@@ -52,9 +52,7 @@
       packages=find_packages('src'),
       package_dir = {'': 'src'},
       namespace_packages=['zope', 'zope.app'],
-      extras_require = dict(test=['zope.app.testing',
-                                  'zope.app.component',
-                                 ]),
+      extras_require = dict(test=['zope.app.testing']),
       install_requires=['setuptools',
                         'zope.component',
                         'zope.interface',

Modified: zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py
===================================================================
--- zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py	2009-12-16 22:42:40 UTC (rev 106669)
+++ zope.app.basicskin/trunk/src/zope/app/basicskin/tests/test_standardmacros.py	2009-12-16 22:45:29 UTC (rev 106670)
@@ -16,12 +16,12 @@
 $Id$
 """
 import unittest
+from zope.component.testing import PlacelessSetup
 from zope.interface import implements, Interface
 from zope.publisher.browser import TestRequest
 from zope.publisher.interfaces.browser import IBrowserView
 
 from zope.app.basicskin.standardmacros import Macros
-from zope.app.component.testing import PlacefulSetup
 from zope.app.testing import ztapi
 
 class ViewWithMacros(object):
@@ -67,10 +67,10 @@
         macro_pages = pages
     return T(C(), TestRequest())
 
-class Test(PlacefulSetup, unittest.TestCase):
+class Test(PlacelessSetup, unittest.TestCase):
 
     def setUp(self):
-        PlacefulSetup.setUp(self)
+        PlacelessSetup.setUp(self)
         ztapi.browserView(I, 'page1', page1)
         ztapi.browserView(I, 'collides_with_page1', collides_with_page1)
         ztapi.browserView(I, 'works_with_page1',  works_with_page1)
@@ -100,8 +100,8 @@
         macros = createMacrosInstance(('page1', 'collides_with_page1'))
         self.assertEqual(macros['afoo'], 'page1_foo')
         self.assertEqual(macros['abar'], 'page1_bar')
-        
 
+
 def test_suite():
     loader = unittest.TestLoader()
     return loader.loadTestsFromTestCase(Test)



More information about the checkins mailing list