Skip to content

Commit

Permalink
Revert to use the old "there can only be one" View approach, which is
Browse files Browse the repository at this point in the history
back again in grokcore.view 1.12.
  • Loading branch information
faassen committed Sep 17, 2009
1 parent 3cb0d86 commit f292a91
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 123 deletions.
5 changes: 3 additions & 2 deletions CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ Changes
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)
----------------
Expand Down
3 changes: 2 additions & 1 deletion buildout.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ extends = http://grok.zope.org/releaseinfo/grok-1.0b1.cfg
versions = versions

[versions]
grokcore.formlib =
grokcore.formlib =
grokcore.view = 1.12

[interpreter]
recipe = zc.recipe.egg
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def read(*rnames):
'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',
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/formlib/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ def render(self):
# 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

Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/formlib/ftests/form/addform.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def __init__(self, name='', size=''):
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,
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/formlib/ftests/form/addform_applydata.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class Mammoth(grok.testing.Model):
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,
Expand Down
2 changes: 1 addition & 1 deletion src/grokcore/formlib/ftests/form/update.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class Mammoth(grok.testing.Model):

name = u'Manfred'

class Index(grok.CodeView):
class Index(grok.View):

def render(self):
return "%s, the Mammoth reports: %s" % (self.context.name,
Expand Down
115 changes: 0 additions & 115 deletions versions.cfg

This file was deleted.

0 comments on commit f292a91

Please sign in to comment.