[Checkins] SVN: zope.app.publisher/trunk/ - reduce dependency on zope.app.component.

Chris McDonough chrism at plope.com
Fri May 22 00:08:21 EDT 2009


Instead of:

 > +                        'zope.component ==3.7.0',

this should probably be:

 > +                        'zope.component >=3.7.0',

- C

On 5/21/09 8:40 PM, Alex Smith wrote:
> Log message for revision 100223:
>
>    - reduce dependency on zope.app.component.
>    - fix tests.
>
>
> Changed:
>    U   zope.app.publisher/trunk/CHANGES.txt
>    U   zope.app.publisher/trunk/setup.py
>    U   zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py
>    U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py
>    U   zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py
>    U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_directives.py
>    U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc.zcml
>    U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml
>    U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_nonamenoperm.zcml
>    U   zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_noperm.zcml
>
> -=-
> Modified: zope.app.publisher/trunk/CHANGES.txt
> ===================================================================
> --- zope.app.publisher/trunk/CHANGES.txt	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/CHANGES.txt	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -10,6 +10,9 @@
>
>   - Use zope.browser for IAdding interface (instead of zope.app.container)
>
> +- Update references to ``zope.app.component.tests.views`` to point to the new
> +  locations in ``zope.component.testfiles.views``.
> +
>   3.6.2 (2009-03-18)
>   ==================
>
>
> Modified: zope.app.publisher/trunk/setup.py
> ===================================================================
> --- zope.app.publisher/trunk/setup.py	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/setup.py	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -41,10 +41,9 @@
>         namespace_packages=['zope', 'zope.app'],
>         include_package_data=True,
>         install_requires=['setuptools',
> -                        'zope.app.component',
>                           'zope.app.pagetemplate',
>                           'zope.app.publication',
> -                        'zope.component',
> +                        'zope.component ==3.7.0',
>                           'zope.configuration',
>                           'zope.container',
>                           'zope.contenttype',
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/browser/metadirectives.py	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -23,7 +23,7 @@
>   from zope.schema import TextLine, Id, Int, Bool
>   from zope.security.zcml import Permission
>
> -from zope.app.component.metadirectives import IBasicViewInformation
> +from zope.component.zcml import IBasicViewInformation
>   from zope.app.publisher.browser.fields import MenuField
>
>   #
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_directives.py	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -40,7 +40,7 @@
>   from zope.traversing.interfaces import ITraversable
>
>   import zope.app.publisher.browser
> -from zope.app.component.tests.views import IC, V1, VZMI, R1, IV
> +from zope.component.testfiles.views import IC, V1, VZMI, R1, IV
>   from zope.app.publisher.browser.fileresource import FileResource
>   from zope.app.publisher.browser.i18nfileresource import I18nFileResource
>   from zope.app.publisher.browser.menu import getFirstMenuItem
> @@ -139,8 +139,8 @@
>               '''
>               <browser:page
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   />
> @@ -162,8 +162,8 @@
>                   id="test_menu" title="Test menu" />
>               <browser:page
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   template="%s"
>                   menu="test_menu"
> @@ -198,8 +198,8 @@
>                   id="test_menu" title="Test menu" />
>               <browser:page
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   template="%s"
>                   menu="test_menu"
> @@ -226,7 +226,7 @@
>                   id="test_menu" title="Test menu"/>
>               <browser:page
>                   name="test"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   template="%s"
>                   menu="test_menu"
> @@ -253,7 +253,7 @@
>               <browser:menu
>                   id="test_menu" title="Test menu" />
>               <browser:pages
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public">
>                 <browser:page
>                     name="test"
> @@ -283,8 +283,8 @@
>               <browser:menu
>                   id="test_menu" title="Test menu" />
>               <browser:pages
> -                for="zope.app.component.tests.views.IC"
> -                class="zope.app.component.tests.views.V1"
> +                for="zope.component.testfiles.views.IC"
> +                class="zope.component.testfiles.views.V1"
>                   permission="zope.Public">
>                 <browser:page
>                     name="test"
> @@ -311,7 +311,7 @@
>               '''
>               <browser:defaultView
>                   name="test"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>               '''
>               )))
>
> @@ -332,11 +332,11 @@
>               '''
>               <browser:defaultView
>                   name="test"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>
>               <browser:defaultView
>                   name="test2"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   layer="
>                     zope.app.publisher.browser.tests.test_directives.ITestLayer"
>                   />
> @@ -377,13 +377,13 @@
>               '''
>               <browser:resource
>                   name="test"
> -                factory="zope.app.component.tests.views.RZMI"
> +                factory="zope.component.testfiles.views.RZMI"
>                   layer="
>                     zope.app.publisher.browser.tests.test_directives.ITestLayer"
>                   />
>               <browser:resource
>                   name="test"
> -                factory="zope.app.component.tests.views.R1"
> +                factory="zope.component.testfiles.views.R1"
>                   />
>               '''
>               )))
> @@ -413,16 +413,16 @@
>               <browser:defaultSkin name="Test Skin" />
>               <browser:page
>                   name="test"
> -                class="zope.app.component.tests.views.VZMI"
> +                class="zope.component.testfiles.views.VZMI"
>                   layer="
>                     zope.app.publisher.browser.tests.test_directives.ITestLayer"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   />
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   />
> @@ -445,16 +445,16 @@
>           xmlconfig(StringIO(template % (
>               '''
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.VZMI"
> +                class="zope.component.testfiles.views.VZMI"
>                   layer="
>                     zope.app.publisher.browser.tests.test_directives.ITestLayer"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   />
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   />
> @@ -515,11 +515,11 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> +                class="zope.component.testfiles.views.V1"
>                   attribute="index"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
> -                allowed_interface="zope.app.component.tests.views.IV"
> +                allowed_interface="zope.component.testfiles.views.IV"
>                   />
>               '''
>               ))
> @@ -534,7 +534,7 @@
>               '''
>               <browser:page name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.V2"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   attribute="action"
>                   permission="zope.Public"
>                   allowed_attributes="action2"
> @@ -553,7 +553,7 @@
>               '''
>               <browser:view name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.V2"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   allowed_attributes="action2"
>                   >
> @@ -573,12 +573,12 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   attribute="index"
>                   allowed_attributes="action"
> -                allowed_interface="zope.app.component.tests.views.IV"
> +                allowed_interface="zope.component.testfiles.views.IV"
>                   />
>               '''
>               ))
> @@ -591,12 +591,12 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   attribute="index"
>                   permission="zope.Public"
>                   allowed_attributes="action index"
> -                allowed_interface="zope.app.component.tests.views.IV"
> +                allowed_interface="zope.component.testfiles.views.IV"
>                   />
>               '''
>               ))
> @@ -612,7 +612,7 @@
>                   name="test"
>                   class="
>                zope.app.publisher.browser.tests.test_directives.C_w_implements"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   attribute="index"
>                   permission="zope.Public"
>                   />
> @@ -630,8 +630,8 @@
>               StringIO(template %
>               '''
>               <browser:page name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   attribute="index"
>                   allowed_attributes="action index"
>                   />
> @@ -648,8 +648,8 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:pages
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>
> @@ -677,7 +677,7 @@
>               <browser:view
>                   name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.V1"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>
> @@ -710,7 +710,7 @@
>               <browser:view
>                   name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.CV"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -730,7 +730,7 @@
>               <browser:view
>                   name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.NCV"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -750,8 +750,8 @@
>               '''
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>
> @@ -787,8 +787,8 @@
>               '''
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>
> @@ -822,12 +822,12 @@
>               '''
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public" />
>
>               <browser:page name="index.html"
> -                for="zope.app.component.tests.views.IV"
> +                for="zope.component.testfiles.views.IV"
>                   class="zope.app.publisher.browser.tests.test_directives.CV"
>                   permission="zope.Public" />
>               '''
> @@ -850,11 +850,11 @@
>               <browser:view
>                   name="test"
>                   class="zope.app.publisher.browser.tests.test_directives.VT"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public" />
>
>               <browser:page name="index.html"
> -                for="zope.app.component.tests.views.IV"
> +                for="zope.component.testfiles.views.IV"
>                   class="zope.app.publisher.browser.tests.test_directives.CV"
>                   permission="zope.Public" />
>               '''
> @@ -879,8 +879,8 @@
>               <permission id="zope.TestPermission" title="Test permission" />
>
>               <browser:pages
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.TestPermission"
>                   >
>
> @@ -911,8 +911,8 @@
>
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>
> @@ -937,7 +937,7 @@
>               '''
>               <browser:pages
>                   for="*"
> -                class="zope.app.component.tests.views.V1"
> +                class="zope.component.testfiles.views.V1"
>                   permission="zope.Public"
>                   >
>                 <browser:page name="index.html" attribute="index" />
> @@ -945,7 +945,7 @@
>
>               <browser:pages
>                   for="*"
> -                class="zope.app.component.tests.views.V1"
> +                class="zope.component.testfiles.views.V1"
>                   layer="
>                     zope.app.publisher.browser.tests.test_directives.ITestLayer"
>                   permission="zope.Public"
> @@ -1045,7 +1045,7 @@
>                   name="index.html"
>                   template="%s"
>                   permission="zope.Public"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>               ''' % path
>               ))
>
> @@ -1068,14 +1068,14 @@
>               <browser:page
>                   name="index.html"
>                   permission="zope.Public"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   template="%s"
>                   menu="test_menu" title="Index"/>
>
>               <browser:page
>                   name="index.html"
>                   permission="zope.Public"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   menu="test_menu" title="Index"
>                   template="%s"
>                   layer="zope.app.publisher.browser.tests.test_directives.ITestLayer"/>
> @@ -1099,7 +1099,7 @@
>                   template="%s"
>                   permission="zope.Public"
>             class="zope.app.publisher.browser.tests.templateclass.templateclass"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>               ''' % path
>               ))
>
> @@ -1125,7 +1125,7 @@
>                   name="xxx.html"
>                   template="%s"
>                   permission="zope.TestPermission"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>               ''' % path
>               ))
>
> @@ -1135,7 +1135,7 @@
>                   name="index.html"
>                   template="%s"
>                   permission="zope.Public"
> -                for="zope.app.component.tests.views.IC" />
> +                for="zope.component.testfiles.views.IC" />
>               ''' % path
>               ))
>
> @@ -1158,7 +1158,7 @@
>               '''
>               <browser:page
>                   template="%s"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   />
>               ''' % path
>               ))
> @@ -1173,7 +1173,7 @@
>               <browser:view
>                   name="index.html"
>                   template="%s"
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   >
>                 <browser:page name="foo.html" attribute="index" />
> @@ -1190,8 +1190,8 @@
>               '''
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -1204,9 +1204,9 @@
>               '''
>               <browser:view
>                   name="test"
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> -                provides="zope.app.component.tests.views.IV"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
> +                provides="zope.component.testfiles.views.IV"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -1223,8 +1223,8 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:view
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -1236,9 +1236,9 @@
>           xmlconfig(StringIO(template %
>               '''
>               <browser:view
> -                class="zope.app.component.tests.views.V1"
> -                for="zope.app.component.tests.views.IC"
> -                provides="zope.app.component.tests.views.IV"
> +                class="zope.component.testfiles.views.V1"
> +                for="zope.component.testfiles.views.IC"
> +                provides="zope.component.testfiles.views.IV"
>                   permission="zope.Public"
>                   />
>               '''
> @@ -1267,7 +1267,7 @@
>   	xmlconfig(StringIO(template %
>               '''
>               <browser:menuItem
> -                for="zope.app.component.tests.views.IC"
> +                for="zope.component.testfiles.views.IC"
>                   title="Test Entry"
>                   menu="test_menu"
>                  action="@@test"
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/browser/tests/test_icondirective.py	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -31,7 +31,7 @@
>
>   import zope.location.interfaces
>   import zope.app.publisher.browser
> -from zope.app.component.tests.views import IC
> +from zope.component.testfiles.views import IC
>   from zope.app.publisher.browser.tests import support
>   from zope.app.testing.placelesssetup import PlacelessSetup
>
> @@ -80,13 +80,13 @@
>           xmlconfig(StringIO(template % (
>               '''
>               <browser:icon name="zmi_icon"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         file="%s" />
>               ''' % path
>               )))
>
>           view = component.getMultiAdapter((ob, request), name='zmi_icon')
> -        rname = 'zope-app-component-tests-views-IC-zmi_icon.gif'
> +        rname = 'zope-component-testfiles-views-IC-zmi_icon.gif'
>           self.assertEqual(
>               view(),
>               '<img src="http://127.0.0.1/@@/%s" alt="IC" '
> @@ -97,14 +97,14 @@
>           xmlconfig(StringIO(template % (
>               '''
>               <browser:icon name="zmi_icon_w_title"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         file="%s" title="click this!" />
>               ''' % path
>               )))
>
>           view = component.getMultiAdapter(
>               (ob, request), name='zmi_icon_w_title')
> -        rname = 'zope-app-component-tests-views-IC-zmi_icon_w_title.gif'
> +        rname = 'zope-component-testfiles-views-IC-zmi_icon_w_title.gif'
>           self.assertEqual(
>               view(),
>               '<img src="http://127.0.0.1/@@/%s" alt="click this!" '
> @@ -115,7 +115,7 @@
>           xmlconfig(StringIO(template % (
>               '''
>               <browser:icon name="zmi_icon_w_width_and_height"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         file="%s"
>                         width="20" height="12" />
>               ''' % path
> @@ -123,7 +123,7 @@
>
>           view = component.getMultiAdapter((ob, request),
>                                            name='zmi_icon_w_width_and_height')
> -        rname = ('zope-app-component-tests-views-IC-'
> +        rname = ('zope-component-testfiles-views-IC-'
>                    'zmi_icon_w_width_and_height.gif')
>           self.assertEqual(
>               view(),
> @@ -150,7 +150,7 @@
>               <browser:resource name="zmi_icon_res"
>                         image="%s" />
>               <browser:icon name="zmi_icon"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         resource="zmi_icon_res" />
>               ''' % path
>               )))
> @@ -182,7 +182,7 @@
>               <browser:resource name="zmi_icon_res"
>                         image="%s" />
>               <browser:icon name="zmi_icon"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         file="%s"
>                         resource="zmi_icon_res" />
>               ''' % (path, path)
> @@ -192,7 +192,7 @@
>           config = StringIO(template % (
>               """
>               <browser:icon name="zmi_icon"
> -                      for="zope.app.component.tests.views.IC"
> +                      for="zope.component.testfiles.views.IC"
>                         />
>               """
>               ))
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_directives.py
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/test_directives.py	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -20,7 +20,7 @@
>   from zope import component
>   from zope.configuration import xmlconfig
>   from zope.configuration.exceptions import ConfigurationError
> -from zope.app.component.tests.views import Request, IC, V1
> +from zope.component.testfiles.views import Request, IC, V1
>   from zope.app.testing.placelesssetup import PlacelessSetup
>   from zope.security.proxy import ProxyFactory
>   from zope.publisher.interfaces.xmlrpc import IXMLRPCRequest
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc.zcml
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc.zcml	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc.zcml	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -7,47 +7,47 @@
>
>     <xmlrpc:view
>         name="test"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         permission="zope.Public"
>         />
>
>     <xmlrpc:view
>         name="test2"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         permission="zope.Public"
> -      interface="zope.app.component.tests.views.IV"
> +      interface="zope.component.testfiles.views.IV"
>         />
>
>     <xmlrpc:view
>         name="test3"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         permission="zope.Public"
>         methods="action" />
>
>     <xmlrpc:view
>         name="test4"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         permission="zope.Public"
>         methods="action"
> -      interface="zope.app.component.tests.views.IV" />
> +      interface="zope.component.testfiles.views.IV" />
>
>     <xmlrpc:view
>         name="test5"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         permission="zope.Public"
>         methods="action index"
> -      interface="zope.app.component.tests.views.IV" />
> +      interface="zope.component.testfiles.views.IV" />
>
>
>     <xmlrpc:view
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> -      interface="zope.app.component.tests.views.IV"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
> +      interface="zope.component.testfiles.views.IV"
>         methods="action"
>         permission="zope.Public"
>         />
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_error.zcml	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -6,8 +6,8 @@
>
>     <xmlrpc:view
>           name="test"
> -        factory="zope.app.component.tests.views.V1"
> -        for="zope.app.component.tests.views.IC"
> +        factory="zope.component.testfiles.views.V1"
> +        for="zope.component.testfiles.views.IC"
>           methods="action index"
>           permission="zope.Public" />
>
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_nonamenoperm.zcml
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_nonamenoperm.zcml	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_nonamenoperm.zcml	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -5,8 +5,8 @@
>     <include package="zope.app.publisher.xmlrpc" file="meta.zcml"/>
>
>     <xmlrpc:view
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         />
>
>   </configure>
>
> Modified: zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_noperm.zcml
> ===================================================================
> --- zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_noperm.zcml	2009-05-22 00:13:45 UTC (rev 100222)
> +++ zope.app.publisher/trunk/src/zope/app/publisher/xmlrpc/tests/xmlrpc_noperm.zcml	2009-05-22 00:40:23 UTC (rev 100223)
> @@ -6,8 +6,8 @@
>
>     <xmlrpc:view
>         name="index"
> -      class="zope.app.component.tests.views.V1"
> -      for="zope.app.component.tests.views.IC"
> +      class="zope.component.testfiles.views.V1"
> +      for="zope.component.testfiles.views.IC"
>         />
>
>   </configure>
>
> _______________________________________________
> Checkins mailing list
> Checkins at zope.org
> http://mail.zope.org/mailman/listinfo/checkins
>



More information about the Checkins mailing list