[cw] update to cw 3.15 (closes #1382707)
authorNicolas Chauvat <nicolas.chauvat@logilab.fr>
Fri, 05 Oct 2012 12:11:00 +0200
changeset 125 8e454581090b
parent 124 1552de882096
child 126 a7c2f1122169
[cw] update to cw 3.15 (closes #1382707)
__pkginfo__.py
debian/control
entities.py
sobjects.py
views.py
--- a/__pkginfo__.py	Mon Sep 24 14:39:57 2012 +0200
+++ b/__pkginfo__.py	Fri Oct 05 12:11:00 2012 +0200
@@ -53,7 +53,7 @@
     ]
 
 __depends_cubes__ = {}
-__depends__ = {'cubicweb': '>= 3.6.0'}
+__depends__ = {'cubicweb': '>= 3.15.0'}
 __use__ = tuple(__depends_cubes__)
 
 from os import listdir as _listdir
--- a/debian/control	Mon Sep 24 14:39:57 2012 +0200
+++ b/debian/control	Fri Oct 05 12:11:00 2012 +0200
@@ -11,7 +11,7 @@
 Conflicts: cubicweb-keywords
 Replaces: cubicweb-keywords
 Architecture: all
-Depends: cubicweb-common (>= 3.6.0)
+Depends: cubicweb-common (>= 3.15.0)
 Description: keyword component for the Cubicweb framework
  This Cubicweb component provides classification (hierarchies of keywords)
  to classify content. See also cubicweb-tag.
--- a/entities.py	Mon Sep 24 14:39:57 2012 +0200
+++ b/entities.py	Fri Oct 05 12:11:00 2012 +0200
@@ -12,11 +12,11 @@
 from cubicweb.entities import AnyEntity, fetch_config, adapters
 from cubicweb.interfaces import ITree
 from cubicweb.view import EntityAdapter
-from cubicweb.selectors import is_instance
+from cubicweb.predicates import is_instance
 
 class Classification(AnyEntity):
     __regid__ = 'Classification'
-    fetch_attrs, fetch_order = fetch_config(['name'])
+    fetch_attrs, cw_fetch_order = fetch_config(['name'])
 
 
 class ClassificationITreeAdapter(EntityAdapter):
@@ -60,7 +60,7 @@
 
 class Keyword(AnyEntity):
     __regid__ = 'Keyword'
-    fetch_attrs, fetch_order = fetch_config(['name'])
+    fetch_attrs, cw_fetch_order = fetch_config(['name'])
 
 
 class KeywordITreeAdapter(adapters.ITreeAdapter):
@@ -121,7 +121,7 @@
 class CodeKeyword(Keyword):
     __regid__ = 'CodeKeyword'
     rest_attr = 'code'
-    fetch_attrs, fetch_order = fetch_config(['code','name'])
+    fetch_attrs, cw_fetch_order = fetch_config(['code','name'])
 
     def dc_title(self):
         return u'%s - %s' % (self.code, self.name)
--- a/sobjects.py	Mon Sep 24 14:39:57 2012 +0200
+++ b/sobjects.py	Fri Oct 05 12:11:00 2012 +0200
@@ -8,7 +8,7 @@
 
 from logilab.common.decorators import cached
 
-from cubicweb.selectors import is_instance
+from cubicweb.predicates import is_instance
 from cubicweb.sobjects.notification import NotificationView
 
 
--- a/views.py	Mon Sep 24 14:39:57 2012 +0200
+++ b/views.py	Fri Oct 05 12:11:00 2012 +0200
@@ -10,7 +10,7 @@
 from logilab.mtconverter import xml_escape
 
 from cubicweb import Unauthorized
-from cubicweb.selectors import is_instance, rql_condition, relation_possible
+from cubicweb.predicates import is_instance, rql_condition, relation_possible
 from cubicweb.view import EntityView
 from cubicweb.web import stdmsgs, uicfg, component, facet
 from cubicweb.web.views import primary, basecontrollers, treeview