[Zope-Checkins] CVS: Zope3/lib/python/Zope/App/ContentDirective/tests - testDirectives.py:1.3 testFactory.py:1.3 testRequirePermissions.py:1.3

[Steve Alexander]

Update of /cvs-repository/Zope3/lib/python/Zope/App/ContentDirective/tests
In directory cvs.zope.org:/tmp/cvs-serv8164/lib/python/Zope/App/ContentDirective/tests

Modified Files:
	testDirectives.py testFactory.py testRequirePermissions.py 
Log Message:
changed foo-meta.zcml in tests to meta.zcml
changed zcml filenames to configure.zcml where feasible, and removed
the file attribute of include directives where I could.


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testDirectives.py 1.2 => 1.3 ===
 defs_path = os.path.join(
     os.path.split(Zope.App.ContentDirective.__file__)[0],
-    'content-meta.zcml')
+    'meta.zcml')
 
 import Zope.App.Security
 security_defs_path = os.path.join(
     os.path.split(Zope.App.Security.__file__)[0],
-    'security-meta.zcml')
+    'meta.zcml')
 
 
 def configfile(s):


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testFactory.py 1.2 => 1.3 ===
 defs_path = os.path.join(
     os.path.split(Zope.App.ContentDirective.__file__)[0],
-    'content-meta.zcml')
+    'meta.zcml')
 
 import Zope.App.Security
 security_defs_path = os.path.join(
     os.path.split(Zope.App.Security.__file__)[0],
-    'security-meta.zcml')
+    'meta.zcml')
 
 
 def configfile(s):


=== Zope3/lib/python/Zope/App/ContentDirective/tests/testRequirePermissions.py 1.2 => 1.3 ===
 defs_path = os.path.join(
     os.path.split(Zope.App.ContentDirective.__file__)[0],
-    'content-meta.zcml')
+    'meta.zcml')
 
 import Zope.App.Security
 security_defs_path = os.path.join(
     os.path.split(Zope.App.Security.__file__)[0],
-    'security-meta.zcml')
+    'meta.zcml')
 
 def defineDirectives():
     xmlconfig(open(defs_path))