Commit 5a928418 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

py3: follow changes on astroid.

parent 9f4cf295
...@@ -159,14 +159,14 @@ class ComponentTool(BaseTool): ...@@ -159,14 +159,14 @@ class ComponentTool(BaseTool):
erp5.component.filesystem_import_dict = None erp5.component.filesystem_import_dict = None
erp5.component.ref_manager.gc() erp5.component.ref_manager.gc()
# Clear pylint cache # Clear astroid (pylint) cache
try: if six.PY2:
from astroid.builder import MANAGER from astroid.builder import MANAGER
except ImportError:
pass
else: else:
from astroid.builder import AstroidManager
MANAGER = AstroidManager()
astroid_cache = MANAGER.astroid_cache astroid_cache = MANAGER.astroid_cache
for k in astroid_cache.keys(): for k in list(astroid_cache.keys()):
if k.startswith('erp5.component.') and k not in component_package_list: if k.startswith('erp5.component.') and k not in component_package_list:
del astroid_cache[k] del astroid_cache[k]
......
...@@ -42,7 +42,13 @@ OptionsManagerMixIn.read_config_file = lambda *args, **kw: None ...@@ -42,7 +42,13 @@ OptionsManagerMixIn.read_config_file = lambda *args, **kw: None
## Pylint transforms and plugin to generate AST for ZODB Components ## Pylint transforms and plugin to generate AST for ZODB Components
from astroid.builder import AstroidBuilder from astroid.builder import AstroidBuilder
from astroid.exceptions import AstroidBuildingException 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: try:
from astroid.builder import _guess_encoding from astroid.builder import _guess_encoding
......
...@@ -2224,7 +2224,11 @@ def function_foo(*args, **kwargs): ...@@ -2224,7 +2224,11 @@ def function_foo(*args, **kwargs):
def _assertAstroidCacheContent(self, def _assertAstroidCacheContent(self,
must_be_in_cache_set, must_be_in_cache_set,
must_not_be_in_cache_set): must_not_be_in_cache_set):
if six.PY2:
from astroid.builder import MANAGER from astroid.builder import MANAGER
else:
from astroid.builder import AstroidManager
MANAGER = AstroidManager()
should_not_be_in_cache_list = [] should_not_be_in_cache_list = []
for modname in MANAGER.astroid_cache: for modname in MANAGER.astroid_cache:
if (modname.startswith('checkPythonSourceCode') or if (modname.startswith('checkPythonSourceCode') or
...@@ -2497,7 +2501,11 @@ from %(namespace)s.erp5_version import %(reference)s ...@@ -2497,7 +2501,11 @@ from %(namespace)s.erp5_version import %(reference)s
reference=imported_reference)) reference=imported_reference))
component.checkSourceCode() component.checkSourceCode()
if six.PY2:
from astroid.builder import MANAGER from astroid.builder import MANAGER
else:
from astroid.builder import AstroidManager
MANAGER = AstroidManager()
imported_module = self._getComponentFullModuleName(imported_reference) imported_module = self._getComponentFullModuleName(imported_reference)
self.assertEqual( self.assertEqual(
MANAGER.astroid_cache[self._getComponentFullModuleName(imported_reference, version='bar')], MANAGER.astroid_cache[self._getComponentFullModuleName(imported_reference, version='bar')],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment