# HG changeset patch # User Aurelien Campeas # Date 1392225332 -3600 # Node ID 9eb810333b0f4ef24522e395e687bcdff1c31be4 # Parent 1910d86afcbcb1a82d825688fd2c43dec168cff1 [hooks/security, devtools/fill] silence yams 0.38.0 warnings diff -r 1910d86afcbc -r 9eb810333b0f __pkginfo__.py --- a/__pkginfo__.py Tue Jan 21 14:56:06 2014 +0100 +++ b/__pkginfo__.py Wed Feb 12 18:15:32 2014 +0100 @@ -43,7 +43,7 @@ 'logilab-common': '>= 0.59.0', 'logilab-mtconverter': '>= 0.8.0', 'rql': '>= 0.31.2', - 'yams': '>= 0.37.0', + 'yams': '>= 0.38.1', #gettext # for xgettext, msgcat, etc... # web dependancies 'simplejson': '>= 2.0.9', diff -r 1910d86afcbc -r 9eb810333b0f cubicweb.spec --- a/cubicweb.spec Tue Jan 21 14:56:06 2014 +0100 +++ b/cubicweb.spec Wed Feb 12 18:15:32 2014 +0100 @@ -23,7 +23,7 @@ Requires: %{python}-logilab-common >= 0.59.0 Requires: %{python}-logilab-mtconverter >= 0.8.0 Requires: %{python}-rql >= 0.31.2 -Requires: %{python}-yams >= 0.37.0 +Requires: %{python}-yams >= 0.38.1 Requires: %{python}-logilab-database >= 1.10.0 Requires: %{python}-passlib Requires: %{python}-lxml diff -r 1910d86afcbc -r 9eb810333b0f debian/control --- a/debian/control Tue Jan 21 14:56:06 2014 +0100 +++ b/debian/control Wed Feb 12 18:15:32 2014 +0100 @@ -15,7 +15,7 @@ python-unittest2 | python (>= 2.7), python-logilab-mtconverter, python-rql, - python-yams (>= 0.37), + python-yams (>= 0.38.1), python-lxml, Standards-Version: 3.9.1 Homepage: http://www.cubicweb.org @@ -151,7 +151,7 @@ gettext, python-logilab-mtconverter (>= 0.8.0), python-logilab-common (>= 0.59.0), - python-yams (>= 0.37.0), + python-yams (>= 0.38.1), python-yams (<< 0.39), python-rql (>= 0.31.2), python-lxml diff -r 1910d86afcbc -r 9eb810333b0f devtools/fill.py --- a/devtools/fill.py Tue Jan 21 14:56:06 2014 +0100 +++ b/devtools/fill.py Wed Feb 12 18:15:32 2014 +0100 @@ -384,10 +384,10 @@ def composite_relation(rschema): for obj in rschema.objects(): - if obj.rdef(rschema, 'object').composite == 'subject': + if obj.rdef(rschema, 'object', takefirst=True).composite == 'subject': return True for obj in rschema.subjects(): - if obj.rdef(rschema, 'subject').composite == 'object': + if obj.rdef(rschema, 'subject', takefirst=True).composite == 'object': return True return False diff -r 1910d86afcbc -r 9eb810333b0f hooks/security.py --- a/hooks/security.py Tue Jan 21 14:56:06 2014 +0100 +++ b/hooks/security.py Wed Feb 12 18:15:32 2014 +0100 @@ -41,7 +41,7 @@ for attr in editedattrs: if attr in dontcheck: continue - rdef = eschema.rdef(attr) + rdef = eschema.rdef(attr, takefirst=True) if rdef.final: # non final relation are checked by standard hooks # attributes only have a specific 'update' permission updateperm = rdef.permissions.get('update')