Use "aq_xxx(self)" instead of "self.aq_xxx"

Author: J. David Ibanez

LocalContent.py

@@ -23,6 +23,7 @@
 from itools.xliff import XLFFile
 
 # Import from Zope
+from Acquisition import aq_base, aq_parent
 from App.class_init import InitializeClass
 from App.Dialogs import MessageDialog
 from OFS.SimpleItem import SimpleItem
@@ -98,11 +99,11 @@ def __call__(self, client=None, REQUEST=None, RESPONSE=None, **kw):
 
         # Get the template to use
         template_id = 'default_template'
-        if hasattr(self.aq_base, 'default_template'):
+        if hasattr(aq_base(self), 'default_template'):
             template_id = self.default_template
 
         # Render the object
-        template = getattr(self.aq_parent, template_id)
+        template = getattr(aq_parent(self), template_id)
         template = template.__of__(self)
         return apply(template, ((client, self), REQUEST), kw)
 

LocalPropertyManager.py

@@ -20,6 +20,7 @@
 
 # Import from Zope
 from AccessControl import ClassSecurityInfo
+from Acquisition import aq_base
 from App.class_init import InitializeClass
 
 # Import from Localizer
@@ -275,14 +276,14 @@ def get_default_language(self):
 
     # Upgrading..
     def _needs_upgrade(self):
-        return hasattr(self.aq_base, 'original_language')
+        return hasattr(aq_base(self), 'original_language')
 
 
     def _upgrade(self):
         # In version 0.7 the language management logic moved to the
         # mixin class LanguageManager, as a consequence the attribute
         # "original_language" changes its name to "_default_language".
-        if hasattr(self.aq_base, 'original_languge'):
+        if hasattr(aq_base(self), 'original_languge'):
             self._default_language = self.original_language
             del self.original_language
 

Localizer.py

@@ -22,6 +22,7 @@
 
 # Import from Zope
 from AccessControl import ClassSecurityInfo
+from Acquisition import aq_parent
 from App.class_init import InitializeClass
 from OFS.Folder import Folder
 from ZPublisher.BeforeTraverse import registerBeforeTraverse, \
@@ -143,15 +144,15 @@ def manage_hook(self, hook=0):
         if hook != self.hooked():
             if hook:
                 hook = NameCaller(self.id)
-                registerBeforeTraverse(self.aq_parent, hook, self.meta_type)
+                registerBeforeTraverse(aq_parent(self), hook, self.meta_type)
             else:
-                unregisterBeforeTraverse(self.aq_parent, self.meta_type)
+                unregisterBeforeTraverse(aq_parent(self), self.meta_type)
 
 
     security.declarePublic('hooked')
     def hooked(self):
         """ """
-        if queryBeforeTraverse(self.aq_parent, self.meta_type):
+        if queryBeforeTraverse(aq_parent(self), self.meta_type):
             return 1
         return 0
 
@@ -233,7 +234,7 @@ def changeLanguage(self, lang, goto=None, expires=None):
         response = request.RESPONSE
 
         # Changes the cookie (it could be something different)
-        parent = self.aq_parent
+        parent = aq_parent(self)
         path = parent.absolute_url()[len(request['SERVER_URL']):] or '/'
         if expires is None:
             response.setCookie('LOCALIZER_LANGUAGE', lang, path=path)