[Checkins] SVN: z3c.wizard/trunk/ - adjust dependencies, reflect changes in zope packages, use new packages and

[Roger Ineichen]

Log message for revision 106112:
  - adjust dependencies, reflect changes in zope packages, use new packages and
    skip dependency to zope.app.publisher

Changed:
  U   z3c.wizard/trunk/CHANGES.txt
  U   z3c.wizard/trunk/setup.py
  U   z3c.wizard/trunk/src/z3c/wizard/README.txt
  U   z3c.wizard/trunk/src/z3c/wizard/zcml.py

-=-
Modified: z3c.wizard/trunk/CHANGES.txt
===================================================================
--- z3c.wizard/trunk/CHANGES.txt	2009-11-30 11:25:39 UTC (rev 106111)
+++ z3c.wizard/trunk/CHANGES.txt	2009-11-30 12:19:12 UTC (rev 106112)
@@ -2,10 +2,11 @@
 CHANGES
 =======
 
-0.7.2 (unreleased)
+0.8.0 (2009-11-30)
 ------------------
 
-- Nothing changed yet.
+- adjust dependencies, reflect changes in zope packages, use new packages and
+  skip dependency to zope.app.publisher
 
 
 0.7.1 (2009-10-27)

Modified: z3c.wizard/trunk/setup.py
===================================================================
--- z3c.wizard/trunk/setup.py	2009-11-30 11:25:39 UTC (rev 106111)
+++ z3c.wizard/trunk/setup.py	2009-11-30 12:19:12 UTC (rev 106112)
@@ -23,7 +23,7 @@
 
 setup (
     name='z3c.wizard',
-    version = '0.7.2dev',
+    version = '0.8.0',
     author = "Roger Ineichen and the Zope Community",
     author_email = "zope-dev at zope.org",
     description = "Wizard based on z3c.form for for Zope3",
@@ -61,7 +61,6 @@
             'zope.app.testing',
             'zope.publisher',
             'zope.testing',
-            'lxml',
             ],
         ),
     install_requires = [
@@ -69,10 +68,11 @@
         'z3c.form >= 2.0',
         'z3c.formui',
         'z3c.pagelet',
-        'zope.app.publisher',
+        'zope.browserpage',
         'zope.component',
         'zope.configuration',
         'zope.event',
+        'zope.i18nmessageid',
         'zope.interface',
         'zope.lifecycleevent',
         'zope.location',

Modified: z3c.wizard/trunk/src/z3c/wizard/README.txt
===================================================================
--- z3c.wizard/trunk/src/z3c/wizard/README.txt	2009-11-30 11:25:39 UTC (rev 106111)
+++ z3c.wizard/trunk/src/z3c/wizard/README.txt	2009-11-30 12:19:12 UTC (rev 106112)
@@ -37,15 +37,16 @@
 registered correctly:
 
   >>> from zope.configuration import xmlconfig
+  >>> import zope.browserresource
   >>> import zope.component
   >>> import zope.viewlet
   >>> import zope.app.publisher.browser
   >>> import z3c.macro
   >>> import z3c.template
   >>> import z3c.formui
+  >>> xmlconfig.XMLConfig('meta.zcml', zope.browserresource)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.component)()
   >>> xmlconfig.XMLConfig('meta.zcml', zope.viewlet)()
-  >>> xmlconfig.XMLConfig('meta.zcml', zope.app.publisher.browser)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.macro)()
   >>> xmlconfig.XMLConfig('meta.zcml', z3c.template)()
   >>> xmlconfig.XMLConfig('configure.zcml', z3c.formui)()

Modified: z3c.wizard/trunk/src/z3c/wizard/zcml.py
===================================================================
--- z3c.wizard/trunk/src/z3c/wizard/zcml.py	2009-11-30 11:25:39 UTC (rev 106111)
+++ z3c.wizard/trunk/src/z3c/wizard/zcml.py	2009-11-30 12:19:12 UTC (rev 106112)
@@ -25,7 +25,10 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
-from zope.app.publisher.browser import viewmeta
+from zope.browserpage.metaconfigure import _handle_for
+from zope.browserpage.metaconfigure import _handle_permission
+from zope.browserpage.metaconfigure import _handle_allowed_interface
+from zope.browserpage.metaconfigure import _handle_allowed_attributes
 
 import z3c.pagelet.zcml
 
@@ -141,7 +144,7 @@
     required = {}
 
     # Get the permission; mainly to correctly handle CheckerPublic.
-    permission = viewmeta._handle_permission(_context, permission)
+    permission = _handle_permission(_context, permission)
 
     # The class must be specified.
     if not class_:
@@ -162,18 +165,18 @@
     new_class = type(class_.__name__, (class_, wizard.Wizard), cdict)
 
     # Set up permission mapping for various accessible attributes
-    viewmeta._handle_allowed_interface(
+    _handle_allowed_interface(
         _context, allowed_interface, permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, allowed_attributes, permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, kwargs.keys(), permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, ('__call__', 'browserDefault', 'update', 'render', 
                    'publishTraverse'), permission, required)
 
     # Register the interfaces.
-    viewmeta._handle_for(_context, for_)
+    _handle_for(_context, for_)
 
     # provide the custom provides interface if not allready provided
     if not provides.implementedBy(new_class):
@@ -201,7 +204,7 @@
     required = {}
 
     # Get the permission; mainly to correctly handle CheckerPublic.
-    permission = viewmeta._handle_permission(_context, permission)
+    permission = _handle_permission(_context, permission)
 
     # The class must be specified.
     if not class_:
@@ -225,18 +228,18 @@
     new_class = type(class_.__name__, (class_, step.Step), cdict)
 
     # Set up permission mapping for various accessible attributes
-    viewmeta._handle_allowed_interface(
+    _handle_allowed_interface(
         _context, allowed_interface, permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, allowed_attributes, permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, kwargs.keys(), permission, required)
-    viewmeta._handle_allowed_attributes(
+    _handle_allowed_attributes(
         _context, ('__call__', 'browserDefault', 'update', 'render', 
                    'publishTraverse'), permission, required)
 
     # Register the interfaces.
-    viewmeta._handle_for(_context, for_)
+    _handle_for(_context, for_)
 
     # provide the custom provides interface if not allready provided
     if not provides.implementedBy(new_class):