# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1250148694 -7200
# Node ID 54d18916374dfdaa788cd219b9352606ceb735c0
# Parent  135580d15d4298a18c6c2578f7d8fdb3dd007635# Parent  bfb21f7a0d132d05adbe77797c8faa46c5f2cab9
merge

diff -r 135580d15d42 -r 54d18916374d cwvreg.py
--- a/cwvreg.py	Thu Aug 13 09:30:03 2009 +0200
+++ b/cwvreg.py	Thu Aug 13 09:31:34 2009 +0200
@@ -389,35 +389,35 @@
                          special_relations={'eid': 'uid', 'has_text': 'fti'})
 
 
-    @deprecated('use vreg["etypes"].etype_class(etype)')
+    @deprecated('[3.4] use vreg["etypes"].etype_class(etype)')
     def etype_class(self, etype):
         return self["etypes"].etype_class(etype)
 
-    @deprecated('use vreg["views"].main_template(*args, **kwargs)')
+    @deprecated('[3.4] use vreg["views"].main_template(*args, **kwargs)')
     def main_template(self, req, oid='main-template', **context):
         return self["views"].main_template(req, oid, **context)
 
-    @deprecated('use vreg[registry].possible_vobjects(*args, **kwargs)')
+    @deprecated('[3.4] use vreg[registry].possible_vobjects(*args, **kwargs)')
     def possible_vobjects(self, registry, *args, **kwargs):
         return self[registry].possible_vobjects(*args, **kwargs)
 
-    @deprecated('use vreg["actions"].possible_actions(*args, **kwargs)')
+    @deprecated('[3.4] use vreg["actions"].possible_actions(*args, **kwargs)')
     def possible_actions(self, req, rset=None, **kwargs):
         return self["actions"].possible_actions(req, rest=rset, **kwargs)
 
-    @deprecated("use vreg['boxes'].select_or_none(...)")
+    @deprecated("[3.4] use vreg['boxes'].select_or_none(...)")
     def select_box(self, oid, *args, **kwargs):
         return self['boxes'].select_or_none(oid, *args, **kwargs)
 
-    @deprecated("use vreg['components'].select_or_none(...)")
+    @deprecated("[3.4] use vreg['components'].select_or_none(...)")
     def select_component(self, cid, *args, **kwargs):
         return self['components'].select_or_none(cid, *args, **kwargs)
 
-    @deprecated("use vreg['actions'].select_or_none(...)")
+    @deprecated("[3.4] use vreg['actions'].select_or_none(...)")
     def select_action(self, oid, *args, **kwargs):
         return self['actions'].select_or_none(oid, *args, **kwargs)
 
-    @deprecated("use vreg['views'].select(...)")
+    @deprecated("[3.4] use vreg['views'].select(...)")
     def select_view(self, __vid, req, rset=None, **kwargs):
         return self['views'].select(__vid, req, rset=rset, **kwargs)
 
diff -r 135580d15d42 -r 54d18916374d devtools/testlib.py
--- a/devtools/testlib.py	Thu Aug 13 09:30:03 2009 +0200
+++ b/devtools/testlib.py	Thu Aug 13 09:31:34 2009 +0200
@@ -625,7 +625,7 @@
 
     # deprecated ###############################################################
 
-    @deprecated('use self.vreg["etypes"].etype_class(etype)(self.request())')
+    @deprecated('[3.4] use self.vreg["etypes"].etype_class(etype)(self.request())')
     def etype_instance(self, etype, req=None):
         req = req or self.request()
         e = self.vreg['etypes'].etype_class(etype)(req)
@@ -633,7 +633,7 @@
         return e
 
     @nocoverage
-    @deprecated('use req = self.request(); rset = req.execute()')
+    @deprecated('[3.4] use req = self.request(); rset = req.execute()')
     def rset_and_req(self, rql, optional_args=None, args=None, eidkey=None):
         """executes <rql>, builds a resultset, and returns a
         couple (rset, req) where req is a FakeRequest
diff -r 135580d15d42 -r 54d18916374d entities/__init__.py
--- a/entities/__init__.py	Thu Aug 13 09:30:03 2009 +0200
+++ b/entities/__init__.py	Thu Aug 13 09:31:34 2009 +0200
@@ -225,22 +225,22 @@
             wdg = widget(cls.vreg, tschema, rschema, cls, 'object')
         return wdg
 
-    @deprecated('use EntityFieldsForm.subject_relation_vocabulary')
+    @deprecated('[3.4] use EntityFieldsForm.subject_relation_vocabulary')
     def subject_relation_vocabulary(self, rtype, limit):
         form = self.vreg.select('forms', 'edition', self.req, entity=self)
         return form.subject_relation_vocabulary(rtype, limit)
 
-    @deprecated('use EntityFieldsForm.object_relation_vocabulary')
+    @deprecated('[3.4] use EntityFieldsForm.object_relation_vocabulary')
     def object_relation_vocabulary(self, rtype, limit):
         form = self.vreg.select('forms', 'edition', self.req, entity=self)
         return form.object_relation_vocabulary(rtype, limit)
 
-    @deprecated('use AutomaticEntityForm.[e]relations_by_category')
+    @deprecated('[3.4] use AutomaticEntityForm.[e]relations_by_category')
     def relations_by_category(self, categories=None, permission=None):
         from cubicweb.web.views.autoform import AutomaticEntityForm
         return AutomaticEntityForm.erelations_by_category(self, categories, permission)
 
-    @deprecated('use AutomaticEntityForm.[e]srelations_by_category')
+    @deprecated('[3.4] use AutomaticEntityForm.[e]srelations_by_category')
     def srelations_by_category(self, categories=None, permission=None):
         from cubicweb.web.views.autoform import AutomaticEntityForm
         return AutomaticEntityForm.esrelations_by_category(self, categories, permission)