Log message for revision 129698: Merged c129542 from 2.13 branch Changed: U Zope/trunk/src/Products/Five/browser/metaconfigure.py U Zope/trunk/src/Products/Five/browser/tests/pages.txt U Zope/trunk/src/Products/Five/browser/tests/test_menu.py
-=- Modified: Zope/trunk/src/Products/Five/browser/metaconfigure.py =================================================================== --- Zope/trunk/src/Products/Five/browser/metaconfigure.py 2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/metaconfigure.py 2013-02-23 12:56:25 UTC (rev 129698) @@ -208,6 +208,8 @@ (_context, name, (for_, layer), permission, class_, allowed_interface, allowed_attributes) = self.args + name = str(name) # De-unicode + required = {} cdict = {} Modified: Zope/trunk/src/Products/Five/browser/tests/pages.txt =================================================================== --- Zope/trunk/src/Products/Five/browser/tests/pages.txt 2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/tests/pages.txt 2013-02-23 12:56:25 UTC (rev 129698) @@ -87,15 +87,15 @@ <Products.Five.browser.metaconfigure.NewStyleClass ...> Both browser:view and browser:page are ILocation providers, so make sure they -have a __name__ attribute: +have a __name__ attribute with a str instance: >>> page = self.folder.unrestrictedTraverse('testoid/eagle.txt') >>> page.__name__ - u'eagle.txt' + 'eagle.txt' >>> view = self.folder.unrestrictedTraverse('testoid/named_view') >>> view.__name__ - u'named_view' + 'named_view' ZPT-based browser pages ----------------------- Modified: Zope/trunk/src/Products/Five/browser/tests/test_menu.py =================================================================== --- Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2013-02-23 05:28:43 UTC (rev 129697) +++ Zope/trunk/src/Products/Five/browser/tests/test_menu.py 2013-02-23 12:56:25 UTC (rev 129698) @@ -49,7 +49,7 @@ >>> menu.sort(lambda x, y: cmp(x['title'], y['title'])) >>> from pprint import pprint >>> pprint(menu[0]) - {'action': u'@@cockatiel_menu_public.html', + {'action': '@@cockatiel_menu_public.html', 'description': u'', 'extra': None, 'icon': None, @@ -100,7 +100,7 @@ >>> menu.sort(lambda x, y: cmp(x['title'], y['title'])) >>> pprint(menu[0]) - {'action': u'@@cockatiel_menu_protected.html', + {'action': '@@cockatiel_menu_protected.html', 'description': u'', 'extra': None, 'icon': None, @@ -109,7 +109,7 @@ 'title': u'Page in a menu (protected)'} >>> pprint(menu[1]) - {'action': u'@@cockatiel_menu_public.html', + {'action': '@@cockatiel_menu_public.html', 'description': u'', 'extra': None, 'icon': None, _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins