[Checkins] SVN: grokcore.formlib/trunk/ Revert to use the old "there can only be one" View approach, which is

Martijn Faassen faassen at startifact.com
Thu Sep 17 04:04:36 EDT 2009


Log message for revision 104168:
  Revert to use the old "there can only be one" View approach, which is
  back again in grokcore.view 1.12.
  

Changed:
  U   grokcore.formlib/trunk/CHANGES.txt
  U   grokcore.formlib/trunk/buildout.cfg
  U   grokcore.formlib/trunk/setup.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/components.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py
  U   grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py
  D   grokcore.formlib/trunk/versions.cfg

-=-
Modified: grokcore.formlib/trunk/CHANGES.txt
===================================================================
--- grokcore.formlib/trunk/CHANGES.txt	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/CHANGES.txt	2009-09-17 08:04:35 UTC (rev 104168)
@@ -4,9 +4,10 @@
 1.4 (unreleased)
 ----------------
 
-- Nothing changed yet.
+* Reflect the changes in ``grokcore.view`` 1.12 where ``View`` and ``CodeView``
+  become a single ``View`` again. This reverts to the View situation of
+  ``grokcore.formlib`` 1.1.
 
-
 1.3 (2009-09-16)
 ----------------
 

Modified: grokcore.formlib/trunk/buildout.cfg
===================================================================
--- grokcore.formlib/trunk/buildout.cfg	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/buildout.cfg	2009-09-17 08:04:35 UTC (rev 104168)
@@ -5,7 +5,8 @@
 versions = versions
 
 [versions]
-grokcore.formlib =
+grokcore.formlib = 
+grokcore.view = 1.12
 
 [interpreter]
 recipe = zc.recipe.egg

Modified: grokcore.formlib/trunk/setup.py
===================================================================
--- grokcore.formlib/trunk/setup.py	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/setup.py	2009-09-17 08:04:35 UTC (rev 104168)
@@ -36,7 +36,7 @@
                       'martian >= 0.10',
                       'grokcore.component >= 1.5',
                       'grokcore.security >= 1.2',
-                      'grokcore.view >= 1.9',
+                      'grokcore.view >= 1.12',
                       'zope.formlib',
                       # for tests:
                       'zope.testing',

Modified: grokcore.formlib/trunk/src/grokcore/formlib/components.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/components.py	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/src/grokcore/formlib/components.py	2009-09-17 08:04:35 UTC (rev 104168)
@@ -71,7 +71,7 @@
                 # causes the widgets to have different data
                 self.resetForm()
                 self.form_reset = False
-            self.form_result = self.template.render(self)
+            self.form_result = self._render_template()
 
         return self.form_result
 

Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform.py	2009-09-17 08:04:35 UTC (rev 104168)
@@ -48,7 +48,7 @@
         self.name = name
         self.size = size
 
-class Index(grok.CodeView):
+class Index(grok.View):
     grok.context(Mammoth)
     def render(self):
         return 'Hi, my name is %s, and I\'m "%s"' % (self.context.name,

Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/addform_applydata.py	2009-09-17 08:04:35 UTC (rev 104168)
@@ -45,7 +45,7 @@
     grok.testing.protect_get(grok.Public, 'name', 'size')
     grok.testing.protect_set(grok.Public, 'name', 'size')
 
-class Index(grok.CodeView):
+class Index(grok.View):
     grok.context(Mammoth)
     def render(self):
         return 'Hi, my name is %s, and I\'m "%s"' % (self.context.name,

Modified: grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py
===================================================================
--- grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/src/grokcore/formlib/ftests/form/update.py	2009-09-17 08:04:35 UTC (rev 104168)
@@ -57,7 +57,7 @@
 
     name = u'Manfred'
 
-class Index(grok.CodeView):
+class Index(grok.View):
 
     def render(self):
         return "%s, the Mammoth reports: %s" % (self.context.name,

Deleted: grokcore.formlib/trunk/versions.cfg
===================================================================
--- grokcore.formlib/trunk/versions.cfg	2009-09-17 07:58:09 UTC (rev 104167)
+++ grokcore.formlib/trunk/versions.cfg	2009-09-17 08:04:35 UTC (rev 104168)
@@ -1,115 +0,0 @@
-# This is a copy of grok/versions.cfg revision 102959.
-#
-# Don't make local modifications here, just override it explicitly in
-# your buildout's [versions] part.
-
-[versions]
-ClientForm = 0.2.9
-grokcore.component = 1.7
-grokcore.formlib = 1.2
-grokcore.security = 1.1
-grokcore.view = 1.9
-grokcore.viewlet = 1.1
-grokui.admin = 0.3.2
-martian = 0.11
-mechanize = 0.1.7b
-pytz = 2007k
-RestrictedPython = 3.4.2
-simplejson = 1.7.1
-z3c.autoinclude = 0.2.2
-z3c.flashmessage = 1.0
-z3c.testsetup = 0.4
-zc.catalog = 1.2.0
-ZConfig = 2.5.1
-zc.recipe.testrunner = 1.0.0
-zdaemon = 2.0.2
-ZODB3 = 3.8.2
-zodbcode = 3.4.0
-zope.annotation = 3.4.1
-zope.app.apidoc = 3.4.3
-zope.app.applicationcontrol = 3.4.3
-zope.app.appsetup = 3.4.1
-zope.app.authentication = 3.4.4
-zope.app.basicskin = 3.4.0
-zope.app.broken = 3.4.0
-zope.app.catalog = 3.5.1
-zope.app.component = 3.4.1
-zope.app.container = 3.5.6
-zope.app.content = 3.4.0
-zope.app.debug = 3.4.1
-zope.app.dependable = 3.4.0
-zope.app.error = 3.5.1
-zope.app.exception = 3.4.1
-zope.app.file = 3.4.4
-zope.app.folder = 3.4.0
-zope.app.form = 3.4.1
-zope.app.generations = 3.4.1
-zope.app.http = 3.4.1
-zope.app.i18n = 3.4.4
-zope.app.interface = 3.4.0
-zope.app.intid = 3.4.1
-zope.app.keyreference = 3.4.1
-zope.app.locales = 3.4.5
-zope.app.onlinehelp = 3.4.1
-zope.app.pagetemplate = 3.4.1
-zope.app.preference = 3.4.1
-zope.app.principalannotation = 3.4.0
-zope.app.publication = 3.4.3
-zope.app.publisher = 3.5.1
-zope.app.renderer = 3.4.0
-zope.app.rotterdam = 3.4.1
-zope.app.schema = 3.4.0
-zope.app.security = 3.5.2
-zope.app.securitypolicy = 3.4.6
-zope.app.server = 3.4.2
-zope.app.session = 3.5.1
-zope.app.skins = 3.4.0
-zope.app.testing = 3.4.3
-zope.app.tree = 3.4.0
-zope.app.twisted = 3.4.1
-zope.app.wsgi = 3.4.1
-zope.app.zapi = 3.4.0
-zope.app.zcmlfiles = 3.4.3
-zope.app.zopeappgenerations = 3.4.0
-zope.cachedescriptors = 3.4.1
-zope.component = 3.4.0
-zope.configuration = 3.4.0
-zope.contentprovider = 3.4.0
-zope.contenttype = 3.4.0
-zope.copypastemove = 3.4.0
-zope.datetime = 3.4.0
-zope.deferredimport = 3.4.0
-zope.deprecation = 3.4.0
-zope.dottedname = 3.4.2
-zope.dublincore = 3.4.0
-zope.error = 3.5.1
-zope.event = 3.4.0
-zope.exceptions = 3.4.0
-zope.filerepresentation = 3.4.0
-zope.formlib = 3.4.0
-zope.hookable = 3.4.0
-zope.i18n = 3.4.0
-zope.i18nmessageid = 3.4.3
-zope.index = 3.4.1
-zope.interface = 3.4.1
-zope.lifecycleevent = 3.4.0
-zope.location = 3.4.0
-zope.minmax = 1.1.0
-zope.modulealias = 3.4.0
-zope.pagetemplate = 3.4.0
-zope.proxy = 3.4.2
-zope.publisher = 3.4.9
-zope.schema = 3.4.0
-zope.security = 3.4.1
-zope.securitypolicy = 3.4.1
-zope.server = 3.4.3
-zope.session = 3.4.1
-zope.size = 3.4.0
-zope.structuredtext = 3.4.0
-zope.tal = 3.4.1
-zope.tales = 3.4.0
-zope.testbrowser = 3.4.2
-zope.testing = 3.7.6
-zope.thread = 3.4
-zope.traversing = 3.4.1
-zope.viewlet = 3.4.2



More information about the checkins mailing list