Merged c129542 from 2.13 branch

zopefoundation · Feb 23, 2013 · fe24a0e · fe24a0e
1 parent a1a2082
commit fe24a0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Products/Five/browser/metaconfigure.py b/src/Products/Five/browser/metaconfigure.py
@@ -208,6 +208,8 @@ def __call__(self):
         (_context, name, (for_, layer), permission, class_,
          allowed_interface, allowed_attributes) = self.args
 
+        name = str(name)  # De-unicode
+
         required = {}
 
         cdict = {}

diff --git a/src/Products/Five/browser/tests/pages.txt b/src/Products/Five/browser/tests/pages.txt
@@ -87,15 +87,15 @@ sure it is now:
   <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
 -----------------------

diff --git a/src/Products/Five/browser/tests/test_menu.py b/src/Products/Five/browser/tests/test_menu.py
@@ -49,7 +49,7 @@ def test_menu():
       >>> 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 @@ def test_menu():
 
       >>> 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 @@ def test_menu():
        '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,