[Checkins] SVN: z3c.menu.ready2go/trunk/ - Removed dependency on ``z3c.i18n`` by declaring the `MessageFactory`

[Michael Howitz]

Log message for revision 107081:
  - Removed dependency on ``z3c.i18n`` by declaring the `MessageFactory`
    locally.
  
  - Using python ``doctest`` module instead of
    ``zope.testing.doctestunit`` as it deprecated now.
  

Changed:
  U   z3c.menu.ready2go/trunk/CHANGES.txt
  U   z3c.menu.ready2go/trunk/setup.py
  A   z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/i18n.py
  U   z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/interfaces.py
  U   z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/tests.py
  U   z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/zcml.py

-=-
Modified: z3c.menu.ready2go/trunk/CHANGES.txt
===================================================================
--- z3c.menu.ready2go/trunk/CHANGES.txt	2009-12-26 11:12:39 UTC (rev 107080)
+++ z3c.menu.ready2go/trunk/CHANGES.txt	2009-12-26 12:05:03 UTC (rev 107081)
@@ -2,10 +2,20 @@
 CHANGES
 =======
 
+0.7.1 (unreleased)
+------------------
+
+- Removed dependency on ``z3c.i18n`` by declaring the z3c
+  `MessageFactory` locally.
+
+- Using python ``doctest`` module instead of
+  ``zope.testing.doctestunit`` as it deprecated now.
+
+
 0.7.0 (2009-11-30)
 ------------------
 
-- adjust dependencies and imports, reflect changes in zope packages
+- Adjust dependencies and imports, to reflect changes in zope packages.
 
 
 0.6.0 (2009-02-07)

Modified: z3c.menu.ready2go/trunk/setup.py
===================================================================
--- z3c.menu.ready2go/trunk/setup.py	2009-12-26 11:12:39 UTC (rev 107080)
+++ z3c.menu.ready2go/trunk/setup.py	2009-12-26 12:05:03 UTC (rev 107081)
@@ -58,13 +58,11 @@
             'zope.container',
             'zope.contentprovider',
             'zope.component',
-            'zope.testing',
             'zope.traversing',
             ],
         ),
     install_requires = [
         'setuptools',
-        'z3c.i18n',
         'z3c.template',
         'zope.browserpage',
         'zope.component',

Added: z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/i18n.py
===================================================================
--- z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/i18n.py	                        (rev 0)
+++ z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/i18n.py	2009-12-26 12:05:03 UTC (rev 107081)
@@ -0,0 +1,17 @@
+##############################################################################
+#
+# Copyright (c) 2009 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+import zope.i18nmessageid
+
+MessageFactory = zope.i18nmessageid.MessageFactory('z3c')


Property changes on: z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/i18n.py
___________________________________________________________________
Added: svn:keywords
   + Id Rev Date
Added: svn:eol-style
   + native

Modified: z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/interfaces.py
===================================================================
--- z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/interfaces.py	2009-12-26 11:12:39 UTC (rev 107080)
+++ z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/interfaces.py	2009-12-26 12:05:03 UTC (rev 107081)
@@ -15,21 +15,20 @@
 $Id: layer.py 197 2007-04-13 05:03:32Z rineichen $
 """
 
+from z3c.menu.ready2go.i18n import MessageFactory as _
 import zope.interface
 import zope.schema
-from zope.viewlet import interfaces
+import zope.viewlet.interfaces
 
-from z3c.i18n import MessageFactory as _
 
-
-class IMenuManager(interfaces.IViewletManager):
+class IMenuManager(zope.viewlet.interfaces.IViewletManager):
     """Generic nenu manager."""
 
     def render():
         """Represent the menu"""
 
 
-class IMenuItem(interfaces.IViewlet):
+class IMenuItem(zope.viewlet.interfaces.IViewlet):
     """Menu item base."""
 
     template = zope.interface.Attribute("""Page template""")

Modified: z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/tests.py
===================================================================
--- z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/tests.py	2009-12-26 11:12:39 UTC (rev 107080)
+++ z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/tests.py	2009-12-26 12:05:03 UTC (rev 107081)
@@ -15,11 +15,10 @@
 $Id: __init__.py 97 2007-03-29 22:58:27Z rineichen $
 """
 
+import doctest
 import unittest
 import zope.interface
 import zope.component
-from zope.testing import doctest
-from zope.testing.doctestunit import DocFileSuite
 from zope.traversing.browser.interfaces import IAbsoluteURL
 from zope.traversing.interfaces import IPhysicallyLocatable
 from zope.site import hooks
@@ -153,11 +152,11 @@
 
 def test_suite():
     return unittest.TestSuite((
-        DocFileSuite('README.txt',
+        doctest.DocFileSuite('README.txt',
             setUp=testing.setUp, tearDown=testing.tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
             ),
-        DocFileSuite('zcml.txt',
+        doctest.DocFileSuite('zcml.txt',
             setUp=testing.setUp, tearDown=testing.tearDown,
             optionflags=doctest.NORMALIZE_WHITESPACE|doctest.ELLIPSIS,
             ),

Modified: z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/zcml.py
===================================================================
--- z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/zcml.py	2009-12-26 11:12:39 UTC (rev 107080)
+++ z3c.menu.ready2go/trunk/src/z3c/menu/ready2go/zcml.py	2009-12-26 12:05:03 UTC (rev 107081)
@@ -32,10 +32,10 @@
 from zope.browserpage.metaconfigure import _handle_for
 from zope.browserpage.metaconfigure import _handle_allowed_interface
 
-from z3c.i18n import MessageFactory as _
+from z3c.menu.ready2go import checker
 from z3c.menu.ready2go import interfaces
-from z3c.menu.ready2go import checker
 from z3c.menu.ready2go import item
+from z3c.menu.ready2go.i18n import MessageFactory as _
 
 
 class IMenuSelectorDirective(zope.interface.Interface):