[Zope3-checkins] CVS: Zope3/src/zope/app/publisher/browser/tests - test_directives.py:1.1.2.2 test_fileresource.py:1.1.2.2 test_globalbrowsermenuservicedirectives.py:1.1.2.2 test_icondirective.py:1.1.2.2 testi18nfileresource.py:1.1.2.2
Jim Fulton
jim@zope.com
Tue, 24 Dec 2002 07:51:43 -0500
Update of /cvs-repository/Zope3/src/zope/app/publisher/browser/tests
In directory cvs.zope.org:/tmp/cvs-serv1158/src/zope/app/publisher/browser/tests
Modified Files:
Tag: NameGeddon-branch
test_directives.py test_fileresource.py
test_globalbrowsermenuservicedirectives.py
test_icondirective.py testi18nfileresource.py
Log Message:
Searched for and changed over 1200 references to Zope.something.
Most of these were either comments, doc strings, or permission ids.
Many were imports or ids in zcml. (much zcml fixup is still needed.
=== Zope3/src/zope/app/publisher/browser/tests/test_directives.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_directives.py:1.1.2.1 Mon Dec 23 14:32:04 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_directives.py Tue Dec 24 07:51:12 2002
@@ -32,10 +32,10 @@
from zope.app.publisher.browser.i18nfileresource import I18nFileResource
-import Zope.App.Publisher.Browser
+import zope.app.publisher.browser
tests_path = os.path.join(
- os.path.split(Zope.App.Publisher.Browser.__file__)[0],
+ os.path.split(zope.app.publisher.browser.__file__)[0],
'tests')
template = """<zopeConfigure
@@ -62,8 +62,8 @@
def setUp(self):
PlacelessSetup.setUp(self)
- XMLConfig('metameta.zcml', Zope.Configuration)()
- XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
+ XMLConfig('metameta.zcml', zope.configuration)()
+ XMLConfig('meta.zcml', zope.app.publisher.browser)()
from zope.component.adapter \
import provideAdapter
@@ -79,8 +79,8 @@
xmlconfig(StringIO(template % (
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC" />
"""
)))
@@ -95,8 +95,8 @@
xmlconfig(StringIO(template % (
"""
<browser:defaultView name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC" />
"""
)))
@@ -115,12 +115,12 @@
"""
<browser:skin name="zmi" layers="zmi default" />
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.VZMI"
+ factory="zope.component.tests.views.VZMI"
layer="zmi"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ for="zope.component.tests.views.IC" />
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC" />
"""
)))
@@ -140,7 +140,7 @@
xmlconfig(StringIO(template % (
"""
<browser:resource name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.R1" />
+ factory="zope.component.tests.views.R1" />
"""
)))
@@ -204,10 +204,10 @@
"""
<browser:skin name="zmi" layers="zmi default" />
<browser:resource name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.RZMI"
+ factory="zope.component.tests.views.RZMI"
layer="zmi" />
<browser:resource name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.R1" />
+ factory="zope.component.tests.views.R1" />
"""
)))
@@ -224,10 +224,10 @@
xmlconfig(StringIO(template %
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
- permission="Zope.Public"
- allowed_interface="Zope.ComponentArchitecture.tests.TestViews.IV"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
+ permission="zope.Public"
+ allowed_interface="zope.component.tests.views.IV"
/>
"""
))
@@ -241,9 +241,9 @@
xmlconfig(StringIO(template %
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
- permission="Zope.Public"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
+ permission="zope.Public"
allowed_attributes="action"
/>
"""
@@ -258,11 +258,11 @@
xmlconfig(StringIO(template %
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
- permission="Zope.Public"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
+ permission="zope.Public"
allowed_attributes="action"
- allowed_interface="Zope.ComponentArchitecture.tests.TestViews.IV"
+ allowed_interface="zope.component.tests.views.IV"
/>
"""
))
@@ -275,11 +275,11 @@
xmlconfig(StringIO(template %
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
- permission="Zope.Public"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
+ permission="zope.Public"
allowed_attributes="action index"
- allowed_interface="Zope.ComponentArchitecture.tests.TestViews.IV"
+ allowed_interface="zope.component.tests.views.IV"
/>
"""
))
@@ -295,8 +295,8 @@
StringIO(template %
"""
<browser:view name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
allowed_attributes="action index"
/>
"""
@@ -310,8 +310,8 @@
xmlconfig(StringIO(template %
"""
<browser:view
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC">
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action" />
@@ -334,8 +334,8 @@
"""
<browser:view
name="test"
- factory="Zope.App.Publisher.Browser.tests.testDirectives.VT"
- for="Zope.ComponentArchitecture.tests.TestViews.IC">
+ factory="zope.app.publisher.browser.tests.testdirectives.VT"
+ for="zope.component.tests.views.IC">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action" />
@@ -366,8 +366,8 @@
"""
<browser:view
name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC">
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action" />
@@ -399,8 +399,8 @@
"""
<browser:view
name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC">
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC">
<browser:defaultPage name="test.html" />
<browser:page name="index.html" attribute="index" />
@@ -435,19 +435,19 @@
<directive name="permission"
attributes="id title description"
handler="
- Zope.App.Security.Registries.metaConfigure.definePermission" />
+ zope.app.security.registries.metaconfigure.definePermission" />
</directives>
<permission id="XXX" title="xxx" />
<browser:view
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
permission="XXX">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action"
- permission="Zope.Public" />
+ permission="zope.Public" />
</browser:view>
"""
))
@@ -472,16 +472,16 @@
<directive name="permission"
attributes="id title description"
handler="
- Zope.App.Security.Registries.metaConfigure.definePermission" />
+ zope.app.security.registries.metaconfigure.definePermission" />
</directives>
<permission id="XXX" title="xxx" />
<browser:view
name="test"
- factory="Zope.ComponentArchitecture.tests.TestViews.V1"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
- permission="Zope.Public">
+ factory="zope.component.tests.views.V1"
+ for="zope.component.tests.views.IC"
+ permission="zope.Public">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action"
@@ -510,7 +510,7 @@
"""
<browser:skin name="skinny" layers="layer default" />
<browser:view
- factory="Zope.ComponentArchitecture.tests.TestViews.V1">
+ factory="zope.component.tests.views.V1">
<browser:page name="index.html" attribute="index" />
<browser:page name="index.html" attribute="action"
@@ -531,7 +531,7 @@
xmlconfig(StringIO(template %
"""
<browser:resource
- factory="Zope.ComponentArchitecture.tests.TestViews.R1">
+ factory="zope.component.tests.views.R1">
<browser:page name="index.html" attribute="index" />
<browser:page name="action.html" attribute="action" />
@@ -576,7 +576,7 @@
<browser:view
name="index.html"
template="%s"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ for="zope.component.tests.views.IC" />
""" % path
))
@@ -594,8 +594,8 @@
<browser:view
name="index.html"
template="%s"
- class="Zope.App.Publisher.Browser.tests.templateclass."
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ class="zope.app.publisher.browser.tests.templateclass."
+ for="zope.component.tests.views.IC" />
""" % path
))
@@ -614,7 +614,7 @@
<directive name="permission"
attributes="id title description"
handler="
- Zope.App.Security.Registries.metaConfigure.definePermission" />
+ zope.app.security.registries.metaconfigure.definePermission" />
</directives>
<permission id="XXX" title="xxx" />
@@ -623,7 +623,7 @@
name="xxx.html"
template="%s"
permission="XXX"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ for="zope.component.tests.views.IC" />
""" % path
))
@@ -632,8 +632,8 @@
<browser:view
name="index.html"
template="%s"
- permission="Zope.Public"
- for="Zope.ComponentArchitecture.tests.TestViews.IC" />
+ permission="zope.Public"
+ for="zope.component.tests.views.IC" />
""" % path
))
@@ -660,7 +660,7 @@
"""
<browser:view
template="%s"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
/>
""" % path
))
@@ -675,7 +675,7 @@
<browser:view
name="index.html"
template="%s"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
>
<browser:page name="foo.html" attribute="index" />
</browser:view>
=== Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py:1.1.2.1 Mon Dec 23 14:32:04 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_fileresource.py Tue Dec 24 07:51:12 2002
@@ -36,7 +36,7 @@
from zope.app.publisher.browser.fileresource import FileResourceFactory
from zope.app.publisher.browser.fileresource import ImageResourceFactory
-import Zope.App.Publisher.Browser.tests as p
+import zope.app.publisher.browser.tests as p
test_directory = os.path.split(p.__file__)[0]
=== Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py:1.1.2.1 Mon Dec 23 14:32:04 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_globalbrowsermenuservicedirectives.py Tue Dec 24 07:51:12 2002
@@ -27,7 +27,7 @@
from zope.app.tests.placelesssetup import PlacelessSetup
import zope.configuration
-import Zope.App.Publisher.Browser
+import zope.app.publisher.browser
template = """<zopeConfigure
xmlns='http://namespaces.zope.org/zope'
@@ -39,8 +39,8 @@
def setUp(self):
PlacelessSetup.setUp(self)
- XMLConfig('metameta.zcml', Zope.Configuration)()
- XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
+ XMLConfig('metameta.zcml', zope.configuration)()
+ XMLConfig('meta.zcml', zope.app.publisher.browser)()
def test(self):
from zope.app.publisher.browser.globalbrowsermenuservice \
@@ -56,14 +56,14 @@
<browser:menuItems menu="test_id"
for="
- Zope.App.Publisher.Browser.tests.testGlobalBrowserMenuService.I1
+ zope.app.publisher.browser.tests.test_globalbrowsermenuservice.I1
">
<browser:menuItem action="a2" title="t2" />
</browser:menuItems>
<browser:menuItems menu="test_id"
for="
- Zope.App.Publisher.Browser.tests.testGlobalBrowserMenuService.I11
+ zope.app.publisher.browser.tests.test_globalbrowsermenuservice.I11
">
<browser:menuItem action="a3" title="t3" filter="context" />
<browser:menuItem action="a4" title="t4" filter="not:context" />
@@ -71,7 +71,7 @@
<browser:menuItems menu="test_id"
for="
- Zope.App.Publisher.Browser.tests.testGlobalBrowserMenuService.I111
+ zope.app.publisher.browser.tests.test_globalbrowsermenuservice.I111
">
<browser:menuItem action="a5" title="t5" />
<browser:menuItem action="a6" title="t6" />
@@ -81,7 +81,7 @@
<browser:menuItems menu="test_id"
for="
- Zope.App.Publisher.Browser.tests.testGlobalBrowserMenuService.I12
+ zope.app.publisher.browser.tests.test_globalbrowsermenuservice.I12
">
<browser:menuItem action="a9" title="t9" />
</browser:menuItems>
=== Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py:1.1.2.1 Mon Dec 23 14:32:04 2002
+++ Zope3/src/zope/app/publisher/browser/tests/test_icondirective.py Tue Dec 24 07:51:12 2002
@@ -32,7 +32,7 @@
from zope.configuration.exceptions import ConfigurationError
import zope.configuration
-import Zope.App.Publisher.Browser
+import zope.app.publisher.browser
template = """<zopeConfigure
xmlns='http://namespaces.zope.org/zope'
@@ -53,28 +53,28 @@
# define the appropriate checker for a FileResource for these tests
from zope.app.security.protectclass import protectName
from zope.app.publisher.browser.fileresource import FileResource
- protectName(FileResource, '__call__', 'Zope.Public')
+ protectName(FileResource, '__call__', 'zope.Public')
class Test(PlacelessSetup, TestCase):
def setUp(self):
PlacelessSetup.setUp(self)
- XMLConfig('metameta.zcml', Zope.Configuration)()
- XMLConfig('meta.zcml', Zope.App.Publisher.Browser)()
+ XMLConfig('metameta.zcml', zope.configuration)()
+ XMLConfig('meta.zcml', zope.app.publisher.browser)()
defineCheckers()
def test(self):
self.assertEqual(queryView(ob, 'zmi_icon', request), None)
- import Zope.App.Publisher.Browser.tests as p
+ import zope.app.publisher.browser.tests as p
path = os.path.split(p.__file__)[0]
path = os.path.join(path, 'test.gif')
xmlconfig(StringIO(template % (
"""
<browser:icon name="zmi_icon"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
file="%s" />
""" % path
)))
@@ -98,7 +98,7 @@
def testResource(self):
self.assertEqual(queryView(ob, 'zmi_icon', request), None)
- import Zope.App.Publisher.Browser.tests as p
+ import zope.app.publisher.browser.tests as p
path = os.path.split(p.__file__)[0]
path = os.path.join(path, 'test.gif')
@@ -107,7 +107,7 @@
<browser:resource name="zmi_icon_res"
image="%s" />
<browser:icon name="zmi_icon"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
resource="zmi_icon_res" />
""" % path
)))
@@ -131,7 +131,7 @@
def testResourceErrors(self):
self.assertEqual(queryView(ob, 'zmi_icon', request), None)
- import Zope.App.Publisher.Browser.tests as p
+ import zope.app.publisher.browser.tests as p
path = os.path.split(p.__file__)[0]
path = os.path.join(path, 'test.gif')
@@ -140,7 +140,7 @@
<browser:resource name="zmi_icon_res"
image="%s" />
<browser:icon name="zmi_icon"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
file="%s"
resource="zmi_icon_res" />
""" % (path, path)
@@ -150,7 +150,7 @@
config = StringIO(template % (
"""
<browser:icon name="zmi_icon"
- for="Zope.ComponentArchitecture.tests.TestViews.IC"
+ for="zope.component.tests.views.IC"
/>
"""
))
=== Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py:1.1.2.1 Mon Dec 23 14:32:04 2002
+++ Zope3/src/zope/app/publisher/browser/tests/testi18nfileresource.py Tue Dec 24 07:51:12 2002
@@ -38,7 +38,7 @@
from zope.app.publisher.browser.i18nfileresource import I18nFileResource, \
I18nFileResourceFactory
from zope.app.publisher.fileresource import File, Image
-import Zope.App.Publisher.Browser.tests as p
+import zope.app.publisher.browser.tests as p
from zope.app.component.metaconfigure import \
provideService, managerHandler
@@ -59,7 +59,7 @@
provideAdapter(IHTTPRequest, IUserPreferredLanguages, BrowserLanguages)
# Setup the negotiator service registry entry
managerHandler('defineService', 'LanguageNegotiation', INegotiator)
- provideService('LanguageNegotiation', negotiator, 'Zope.Public')
+ provideService('LanguageNegotiation', negotiator, 'zope.Public')
def _createObject(self):