[Checkins] SVN: zope.formlib/trunk/ Use named template from zope.browserpage in favor of zope.app.pagetemplate

[Hanno Schlichting]

Log message for revision 106944:
  Use named template from zope.browserpage in favor of zope.app.pagetemplate
  

Changed:
  U   zope.formlib/trunk/CHANGES.txt
  U   zope.formlib/trunk/setup.py
  U   zope.formlib/trunk/src/zope/formlib/form.py
  U   zope.formlib/trunk/src/zope/formlib/namedtemplate.py
  U   zope.formlib/trunk/src/zope/formlib/tests.py

-=-
Modified: zope.formlib/trunk/CHANGES.txt
===================================================================
--- zope.formlib/trunk/CHANGES.txt	2009-12-22 21:47:37 UTC (rev 106943)
+++ zope.formlib/trunk/CHANGES.txt	2009-12-22 21:49:19 UTC (rev 106944)
@@ -2,9 +2,10 @@
 Changes
 =======
 
-3.9.1 (unreleased)
-==================
+3.10.0 (unreleased)
+===================
 
+- Use named template from zope.browserpage in favor of zope.app.pagetemplate.
 
 3.9.0 (2009-12-22)
 ==================

Modified: zope.formlib/trunk/setup.py
===================================================================
--- zope.formlib/trunk/setup.py	2009-12-22 21:47:37 UTC (rev 106943)
+++ zope.formlib/trunk/setup.py	2009-12-22 21:49:19 UTC (rev 106944)
@@ -26,7 +26,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '3.9.1dev'
+version = '3.10.0dev'
 
 setup(name='zope.formlib',
       version=version,
@@ -55,9 +55,8 @@
       install_requires=['setuptools',
                         'pytz',
                         'zope.app.form',
-                        'zope.app.pagetemplate>=3.6.0',
                         'zope.browser>=1.1',
-                        'zope.browserpage>=3.10.1',
+                        'zope.browserpage>=3.11.0',
                         'zope.component',
                         'zope.event',
                         'zope.i18n',

Modified: zope.formlib/trunk/src/zope/formlib/form.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/form.py	2009-12-22 21:47:37 UTC (rev 106943)
+++ zope.formlib/trunk/src/zope/formlib/form.py	2009-12-22 21:49:19 UTC (rev 106944)
@@ -36,7 +36,7 @@
 from zope.schema.interfaces import ValidationError
 from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent
 from zope.lifecycleevent import Attributes
-from zope.app.pagetemplate import namedtemplate
+from zope.browserpage import namedtemplate
 
 import zope.app.form.browser.interfaces
 from zope.app.form.interfaces import IInputWidget, IDisplayWidget

Modified: zope.formlib/trunk/src/zope/formlib/namedtemplate.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/namedtemplate.py	2009-12-22 21:47:37 UTC (rev 106943)
+++ zope.formlib/trunk/src/zope/formlib/namedtemplate.py	2009-12-22 21:49:19 UTC (rev 106944)
@@ -17,6 +17,6 @@
 """
 
 # BBB
-from zope.app.pagetemplate.namedtemplate import (
+from zope.browserpage.namedtemplate import (
     INamedTemplate, NamedTemplateImplementation, implementation,
     NamedTemplate, NamedTemplatePathAdapter)

Modified: zope.formlib/trunk/src/zope/formlib/tests.py
===================================================================
--- zope.formlib/trunk/src/zope/formlib/tests.py	2009-12-22 21:47:37 UTC (rev 106943)
+++ zope.formlib/trunk/src/zope/formlib/tests.py	2009-12-22 21:49:19 UTC (rev 106944)
@@ -40,7 +40,7 @@
 import zope.formlib
 import zope.formlib.form
 import zope.formlib.interfaces
-import zope.app.pagetemplate.namedtemplate
+from zope.browserpage.namedtemplate import NamedTemplateImplementation
 
 from zope.configuration.xmlconfig import XMLConfig
 
@@ -57,7 +57,7 @@
         )
 
 @adapter(zope.formlib.interfaces.IForm)
- at zope.app.pagetemplate.namedtemplate.NamedTemplateImplementation
+ at NamedTemplateImplementation
 def TestTemplate(self):
     status = self.status
     if status: