# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1260259747 -3600
# Node ID f0d1038e5059daf2e3574d50cb12d102576796f3
# Parent  f6c65e04704c3d0d1b07e3aad88abcdd5eaaf3cc
.id backward compat

diff -r f6c65e04704c -r f0d1038e5059 appobject.py
--- a/appobject.py	Tue Dec 08 08:46:15 2009 +0100
+++ b/appobject.py	Tue Dec 08 09:09:07 2009 +0100
@@ -310,6 +310,11 @@
     # deprecated ###############################################################
 
     @property
+    @deprecated('[3.6] use self.__regid__')
+    def id(self):
+        return self.__regid__
+
+    @property
     @deprecated('[3.6] use self._cw.vreg')
     def vreg(self):
         return self._cw.vreg
diff -r f6c65e04704c -r f0d1038e5059 vregistry.py
--- a/vregistry.py	Tue Dec 08 08:46:15 2009 +0100
+++ b/vregistry.py	Tue Dec 08 09:09:07 2009 +0100
@@ -64,7 +64,7 @@
         warn('[3.6] %s.%s: id is deprecated, use __regid__'
              % (cls.__module__, cls.__name__), DeprecationWarning)
         cls.__regid__ = cls.id
-    if hasattr(cls, 'id'):
+    if hasattr(cls, 'id') and not isinstance(cls.id, property):
         return cls.id
     return cls.__regid__