[Checkins] SVN: grokcore.viewlet/trunk/src/grokcore/viewlet/ Updated tests to keep return value consistency to unicode string, as required by the viewletmanager implementation.
Souheil CHELFOUH
souheil at chelfouh.com
Sun Feb 28 14:41:53 EST 2010
Log message for revision 109514:
Updated tests to keep return value consistency to unicode string, as required by the viewletmanager implementation.
Changed:
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/view_directive.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_template.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_ambiguous_manager.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py
U grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_render_and_template.py
-=-
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/view_directive.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/view_directive.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/view_directive.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -24,16 +24,20 @@
import grokcore.viewlet as grok
+
class Fred(grok.Context):
pass
+
class CaveView(grok.View):
def render(self):
- return 'Cave'
+ return u"Cave"
+
class BoneView(grok.View):
pass
+
grok.view(CaveView)
class CaveManager(grok.ViewletManager):
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_context.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -63,7 +63,7 @@
grok.viewletmanager(CavemenViewletManager)
def render(self):
- return 'Me Fred'
+ return u"Me Fred"
class Cave(grok.Context):
@@ -72,4 +72,4 @@
class Index(grok.View):
def render(self):
- return "hoi"
+ return u"hoi"
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_interface.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -35,7 +35,7 @@
grok.viewletmanager(ICavemenViewletManager)
def render(self):
- return u'Me Fred'
+ return u"Me Fred"
class Cave(grok.Context):
pass
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewlet_security.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -110,20 +110,25 @@
class CaveWoman(grok.Context):
pass
+
class CaveMan(grok.Context):
pass
+
class CaveView(grok.View):
grok.context(Interface)
+
class FireView(grok.View):
grok.context(Interface)
grok.template('caveview')
+
class Pot(grok.ViewletManager):
grok.context(Interface)
grok.name('pot')
+
class TRexBone(grok.Viewlet):
grok.context(Interface)
grok.viewletmanager(Pot)
@@ -131,6 +136,7 @@
def render(self):
return u"T-Rex Bone"
+
class BrackerBone(grok.Viewlet):
grok.context(Interface)
grok.viewletmanager(Pot)
@@ -138,25 +144,29 @@
def render(self):
return u"Brack Bone"
+
class GoldBone(grok.Viewlet):
grok.context(Interface)
grok.viewletmanager(Pot)
grok.require('bone.gold')
def render(self):
- return 'Gold Bone'
+ return u"Gold Bone"
+
class IBoneLayer(IDefaultBrowserLayer):
grok.skin('boneskin')
+
class LayeredBone(grok.Viewlet):
grok.context(Interface)
grok.viewletmanager(Pot)
grok.layer(IBoneLayer)
def render(self):
- return 'Layered Bone'
+ return u"Layered Bone"
+
class ManBone(grok.Viewlet):
grok.viewletmanager(Pot)
grok.context(CaveMan)
@@ -164,18 +174,21 @@
def render(self):
return u"Man Bone"
+
class LadyViewlet(grok.Viewlet):
grok.context(Interface)
grok.viewletmanager(Pot)
grok.view(FireView)
def render(self):
- return 'Lady Viewlet'
+ return u"Lady Viewlet"
+
class NamedViewletManager(grok.ViewletManager):
grok.context(Interface)
grok.name('managerwithname')
+
class NamedViewlet(grok.Viewlet):
grok.context(Interface)
grok.name('viewletwithname')
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_template.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_template.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/ftests/viewlet/viewletmanager_template.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -34,12 +34,15 @@
import grokcore.viewlet as grok
+
class Fred(grok.Context):
pass
+
class OrderView(grok.View):
pass
+
class CaveManager(grok.ViewletManager):
grok.name('cave')
@@ -54,47 +57,53 @@
k.sort()
return k
+
class CaveViewlet(grok.Viewlet):
grok.order(30)
grok.viewletmanager(CaveManager)
grok.name('Cave')
def render(self):
- return "Cave"
+ return u"Cave"
+
class BarneyViewlet(grok.Viewlet):
grok.order(60)
grok.viewletmanager(CaveManager)
grok.name('Barney')
+
class BoneViewlet(grok.Viewlet):
grok.order(10)
grok.viewletmanager(CaveManager)
grok.name('Bone')
def render(self):
- return "Bone"
+ return u"Bone"
+
class WilmaViewlet(grok.Viewlet):
grok.order(50)
grok.viewletmanager(CaveManager)
grok.name('Wilma')
def render(self):
- return "Wilma"
+ return u"Wilma"
+
class GoldViewlet(grok.Viewlet):
grok.order(1)
grok.viewletmanager(CaveManager)
grok.name('Gold')
def render(self):
- return "Gold"
+ return u"Gold"
+
class FredViewlet(grok.Viewlet):
grok.order(20)
grok.viewletmanager(CaveManager)
grok.name('Fred')
def render(self):
- return "Fred"
+ return u"Fred"
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_ambiguous_manager.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_ambiguous_manager.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_ambiguous_manager.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -12,18 +12,19 @@
import grokcore.viewlet as grok
from zope.interface import Interface
+
class ViewletManager(grok.ViewletManager):
grok.name('foo')
grok.context(Interface)
+
class ViewletManager2(grok.ViewletManager):
grok.name('bar')
grok.context(Interface)
+
class Viewlet(grok.Viewlet):
grok.context(Interface)
def render(self):
- return "Render method"
-
-
+ return u"Render method"
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_references.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -48,7 +48,7 @@
grok.name('with_items')
def render(self):
- return ''
+ return u""
class ViewItemsManager(grok.ViewletManager):
@@ -59,11 +59,11 @@
grok.name('item_one')
def render(self):
- return "Item one reporting, sir!"
+ return u"Item one reporting, sir!"
class ItemTwoViewlet(grok.Viewlet):
grok.name('item_two')
def render(self):
- return "Item two reporting, sir!"
+ return u"Item two reporting, sir!"
Modified: grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_render_and_template.py
===================================================================
--- grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_render_and_template.py 2010-02-28 19:40:47 UTC (rev 109513)
+++ grokcore.viewlet/trunk/src/grokcore/viewlet/tests/viewlet/viewlet_render_and_template.py 2010-02-28 19:41:53 UTC (rev 109514)
@@ -13,15 +13,15 @@
import grokcore.viewlet as grok
from zope.interface import Interface
+
class ViewletManager(grok.ViewletManager):
grok.name('foo')
grok.context(Interface)
+
class Viewlet(grok.Viewlet):
grok.viewletmanager(ViewletManager)
grok.context(Interface)
def render(self):
- return "Render method but also a template!"
-
-
+ return u"Render method but also a template!"
More information about the checkins
mailing list