# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1305823797 -7200
# Node ID a78cc15227efdcb5370a16e2799b65125952f003
# Parent  8c752d113ebb943d3e11dc576235dfd54b6d2aef
[deprecation] drop remaining warnings

diff -r 8c752d113ebb -r a78cc15227ef req.py
--- a/req.py	Thu May 19 17:53:46 2011 +0200
+++ b/req.py	Thu May 19 18:49:57 2011 +0200
@@ -88,7 +88,7 @@
         rset = ResultSet([('A',)]*size, '%s X' % etype,
                          description=[(etype,)]*size)
         def get_entity(row, col=0, etype=etype, req=self, rset=rset):
-            return req.vreg.etype_class(etype)(req, rset, row, col)
+            return req.vreg['etypes'].etype_class(etype)(req, rset, row, col)
         rset.get_entity = get_entity
         rset.req = self
         return rset
diff -r 8c752d113ebb -r a78cc15227ef web/schemaviewer.py
--- a/web/schemaviewer.py	Thu May 19 17:53:46 2011 +0200
+++ b/web/schemaviewer.py	Thu May 19 18:49:57 2011 +0200
@@ -151,9 +151,9 @@
                     continue
                 label = rschema.type
                 if role == 'subject':
-                    cards = rschema.rproperty(eschema, oeschema, 'cardinality')
+                    cards = rschema.rdef(eschema, oeschema).cardinality
                 else:
-                    cards = rschema.rproperty(oeschema, eschema, 'cardinality')
+                    cards = rschema.rdef(oeschema, eschema).cardinality
                     cards = cards[::-1]
                 label = '%s %s %s' % (CARD_MAP[cards[1]], label,
                                       CARD_MAP[cards[0]])