Mercurial Mercurial > pub > hg > cubicweb / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[deprecation] drop remaining warnings stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Thu, 19 May 2011 18:49:57 +0200
branchstable
changeset 7407 a78cc15227ef
parent 7405 8c752d113ebb
child 7408 9ad9ce340c5f
[deprecation] drop remaining warnings
req.py file | annotate | diff | comparison | revisions
web/schemaviewer.py file | annotate | diff | comparison | revisions 
--- 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
--- 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]])
cubicweb