[Checkins] SVN: zc.resourcelibrary/trunk/ pin versions to ZTK and fix the tests for those versions

[Christian Zagrodnick]

Log message for revision 110144:
  pin versions to ZTK and fix the tests for those versions
  
  Note that I pinned the ZTK to specific revisions until there is a release 

Changed:
  U   zc.resourcelibrary/trunk/buildout.cfg
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/ftesting.zcml
  U   zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/test_unit.py

-=-
Modified: zc.resourcelibrary/trunk/buildout.cfg
===================================================================
--- zc.resourcelibrary/trunk/buildout.cfg	2010-03-24 09:05:28 UTC (rev 110143)
+++ zc.resourcelibrary/trunk/buildout.cfg	2010-03-24 09:06:50 UTC (rev 110144)
@@ -1,7 +1,13 @@
 [buildout]
+extends =
+    http://svn.zope.org/repos/main/zopetoolkit/trunk/ztk.cfg?p=109981
+    http://svn.zope.org/repos/main/zopetoolkit/trunk/zopeapp.cfg?p=109918
 develop = .
 parts = test pydev
 
+[versions]
+zc.resourcelibrary =
+
 [test]
 recipe = zc.recipe.testrunner
 eggs = zc.resourcelibrary [test]

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/ftesting.zcml
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/ftesting.zcml	2010-03-24 09:05:28 UTC (rev 110143)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/ftesting.zcml	2010-03-24 09:06:50 UTC (rev 110144)
@@ -17,7 +17,7 @@
       title="Unauthenticated User" />
 
 
-  <include package="zope.app.securitypolicy" file="meta.zcml"/>
+  <include package="zope.securitypolicy" file="meta.zcml"/>
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

Modified: zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/test_unit.py
===================================================================
--- zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/test_unit.py	2010-03-24 09:05:28 UTC (rev 110143)
+++ zc.resourcelibrary/trunk/src/zc/resourcelibrary/tests/test_unit.py	2010-03-24 09:06:50 UTC (rev 110144)
@@ -1,6 +1,5 @@
 import doctest
 import unittest
-from zope.testing.doctestunit import DocTestSuite
 
 from zc.resourcelibrary import resourcelibrary
 from zc.resourcelibrary.resourcelibrary import LibraryInfo
@@ -65,8 +64,8 @@
 def test_suite():
     return unittest.TestSuite(
         (
-        DocTestSuite(setUp=setUp, tearDown=tearDown),
-        DocTestSuite('zc.resourcelibrary.publication',
+        doctest.DocTestSuite(setUp=setUp, tearDown=tearDown),
+        doctest.DocTestSuite('zc.resourcelibrary.publication',
                      optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
                      ),
         ))