[Checkins] SVN: zope.app.zcmlfiles/trunk/ - Use new ``zope.app.locales`` which has its own `configure.zcml`.

[Michael Howitz]

Log message for revision 107193:
  - Use new ``zope.app.locales`` which has its own `configure.zcml`.
  
  - No longer using ``zope.testing.doctestunit`` as it is deprecated
    now. Using python's ``doctest`` module.
  
  

Changed:
  U   zope.app.zcmlfiles/trunk/CHANGES.txt
  U   zope.app.zcmlfiles/trunk/setup.py
  U   zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/configure.zcml
  U   zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/tests.py

-=-
Modified: zope.app.zcmlfiles/trunk/CHANGES.txt
===================================================================
--- zope.app.zcmlfiles/trunk/CHANGES.txt	2009-12-28 08:59:41 UTC (rev 107192)
+++ zope.app.zcmlfiles/trunk/CHANGES.txt	2009-12-28 09:11:54 UTC (rev 107193)
@@ -4,12 +4,16 @@
 3.6.2 (unreleased)
 ------------------
 
+- Use new ``zope.app.locales`` which has its own `configure.zcml`.
 
+- No longer using ``zope.testing.doctestunit`` as it is deprecated
+  now. Using python's ``doctest`` module.
+
 3.6.1 (2009-12-16)
 ------------------
 
 - Removed reference to no longer existing configure.zcml from
-  zope.app.pagetemplate.tests.
+  ``zope.app.pagetemplate.tests``.
 
 
 3.6.0 (2009-07-11)

Modified: zope.app.zcmlfiles/trunk/setup.py
===================================================================
--- zope.app.zcmlfiles/trunk/setup.py	2009-12-28 08:59:41 UTC (rev 107192)
+++ zope.app.zcmlfiles/trunk/setup.py	2009-12-28 09:11:54 UTC (rev 107193)
@@ -91,7 +91,7 @@
                       'zope.app.generations',
                       'zope.app.http',
                       'zope.app.i18n',
-                      'zope.app.locales',
+                      'zope.app.locales >= 3.6.0',
                       'zope.app.pagetemplate',
                       'zope.app.principalannotation',
                       'zope.app.publication',

Modified: zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/configure.zcml
===================================================================
--- zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/configure.zcml	2009-12-28 08:59:41 UTC (rev 107192)
+++ zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/configure.zcml	2009-12-28 09:11:54 UTC (rev 107193)
@@ -45,10 +45,7 @@
   <include package="zope.app.http" />
 
   <!-- Translations -->
-  <configure package="zope.app.locales">
-    <i18n:registerTranslations directory="." />
-  </configure>
-
+  <include package="zope.app.locales" />
   <include package="zope.app.i18n" />
 
   <!-- Database boostrapping and maintanance -->

Modified: zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/tests.py
===================================================================
--- zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/tests.py	2009-12-28 08:59:41 UTC (rev 107192)
+++ zope.app.zcmlfiles/trunk/src/zope/app/zcmlfiles/tests.py	2009-12-28 09:11:54 UTC (rev 107193)
@@ -1,5 +1,4 @@
-import unittest
-from zope.testing.doctestunit import DocTestSuite
+import doctest
 
 def test_include():
     """
@@ -28,9 +27,4 @@
     """
 
 def test_suite():
-    return unittest.TestSuite((
-        DocTestSuite(),
-        ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
+    return doctest.DocTestSuite()