--- a/web/views/schema.py	Thu Jul 16 17:00:19 2009 +0200
+++ b/web/views/schema.py	Thu Jul 16 17:00:55 2009 +0200
@@ -27,7 +27,7 @@
 
 def skip_types(req):
     if int(req.form.get('skipmeta', True)):
-        return schema.SKIP_TYPES
+        return SKIP_TYPES
     return ()
 
 class ViewSchemaAction(action.Action):
@@ -191,15 +191,15 @@
 
 class RestrictedSchemaVisitorMixIn(object):
     def __init__(self, req, *args, **kwargs):
+        self.req = req
         super(RestrictedSchemaVisitorMixIn, self).__init__(*args, **kwargs)
-        self.req = req
 
-    def should_display_schema(self, schema):
-        return (super(RestrictedSchemaVisitorMixIn, self).should_display_schema(schema)
+    def should_display_schema(self, rschema):
+        return (super(RestrictedSchemaVisitorMixIn, self).should_display_schema(rschema)
                 and rschema.has_local_role('read') or rschema.has_perm(self.req, 'read'))
 
-    def should_display_attr(self, schema):
-        return (super(RestrictedSchemaVisitorMixIn, self).should_display_attr(schema)
+    def should_display_attr(self, rschema):
+        return (super(RestrictedSchemaVisitorMixIn, self).should_display_attr(rschema)
                 and rschema.has_local_role('read') or rschema.has_perm(self.req, 'read'))
 
 

--- a/web/views/startup.py	Thu Jul 16 17:00:19 2009 +0200
+++ b/web/views/startup.py	Thu Jul 16 17:00:55 2009 +0200
@@ -10,7 +10,7 @@
 _ = unicode
 
 from logilab.common.textutils import unormalize
-from logilab.mtconverter import html_escape
+from logilab.mtconverter import xml_escape
 
 from cubicweb.view import StartupView
 from cubicweb.selectors import match_user_groups, implements