py3: follow changes on astroid.

product/ERP5Type/Tool/ComponentTool.py

@@ -159,16 +159,16 @@ class ComponentTool(BaseTool):
       erp5.component.filesystem_import_dict = None
       erp5.component.ref_manager.gc()
 
-      # Clear pylint cache
-      try:
+      # Clear astroid (pylint) cache
+      if six.PY2:
         from astroid.builder import MANAGER
-      except ImportError:
-        pass
       else:
-        astroid_cache = MANAGER.astroid_cache
-        for k in astroid_cache.keys():
-          if k.startswith('erp5.component.') and k not in component_package_list:
-            del astroid_cache[k]
+        from astroid.builder import AstroidManager
+        MANAGER = AstroidManager()
+      astroid_cache = MANAGER.astroid_cache
+      for k in list(astroid_cache.keys()):
+        if k.startswith('erp5.component.') and k not in component_package_list:
+          del astroid_cache[k]
 
     if reset_portal_type_at_transaction_boundary:
       portal.portal_types.resetDynamicDocumentsOnceAtTransactionBoundary()

product/ERP5Type/patches/pylint.py

@@ -42,7 +42,13 @@ OptionsManagerMixIn.read_config_file = lambda *args, **kw: None
 ## Pylint transforms and plugin to generate AST for ZODB Components
 from astroid.builder import AstroidBuilder
 from astroid.exceptions import AstroidBuildingException
-from astroid import MANAGER, node_classes
+from astroid import node_classes
+
+if six.PY2:
+  from astroid import MANAGER
+else:
+  from astroid import AstroidManager
+  MANAGER = AstroidManager()
 
 try:
   from astroid.builder import _guess_encoding

product/ERP5Type/tests/testDynamicClassGeneration.py

@@ -2217,7 +2217,11 @@ def function_foo(*args, **kwargs):
   def _assertAstroidCacheContent(self,
                                  must_be_in_cache_set,
                                  must_not_be_in_cache_set):
-    from astroid.builder import MANAGER
+    if six.PY2:
+      from astroid.builder import MANAGER
+    else:
+      from astroid.builder import AstroidManager
+      MANAGER = AstroidManager()
     should_not_be_in_cache_list = []
     for modname in MANAGER.astroid_cache:
       if (modname.startswith('checkPythonSourceCode') or
@@ -2490,7 +2494,11 @@ from %(namespace)s.erp5_version import %(reference)s
            reference=imported_reference))
 
       component.checkSourceCode()
-      from astroid.builder import MANAGER
+      if six.PY2:
+        from astroid.builder import MANAGER
+      else:
+        from astroid.builder import AstroidManager
+        MANAGER = AstroidManager()
       imported_module = self._getComponentFullModuleName(imported_reference)
       self.assertEqual(
         MANAGER.astroid_cache[self._getComponentFullModuleName(imported_reference, version='bar')],