From 04231bf2ef05fb7a6cb35a397436056267ccbed2 Mon Sep 17 00:00:00 2001 From: bageljr Date: Thu, 26 May 2022 16:00:06 +0530 Subject: [PATCH 1/5] fix: windows --- rope/contrib/autoimport/sqlite.py | 36 ++++++++++++++----------------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/rope/contrib/autoimport/sqlite.py b/rope/contrib/autoimport/sqlite.py index b06471c2a..5e5426430 100644 --- a/rope/contrib/autoimport/sqlite.py +++ b/rope/contrib/autoimport/sqlite.py @@ -11,23 +11,13 @@ from rope.base import exceptions, libutils, resourceobserver, taskhandle from rope.base.project import Project from rope.base.resources import Resource -from rope.contrib.autoimport.defs import ( - ModuleFile, - Name, - NameType, - Package, - PackageType, - SearchResult, - Source, -) +from rope.contrib.autoimport.defs import (ModuleFile, Name, NameType, Package, + PackageType, SearchResult, Source) from rope.contrib.autoimport.parse import get_names -from rope.contrib.autoimport.utils import ( - get_files, - get_modname_from_path, - get_package_tuple, - sort_and_deduplicate, - sort_and_deduplicate_tuple, -) +from rope.contrib.autoimport.utils import (get_files, get_modname_from_path, + get_package_tuple, + sort_and_deduplicate, + sort_and_deduplicate_tuple) from rope.refactor import importutils @@ -434,10 +424,16 @@ def _del_if_exist(self, module_name, commit: bool = True): self.connection.commit() def _get_python_folders(self) -> List[pathlib.Path]: - folders = self.project.get_python_path_folders() - folder_paths = [ - pathlib.Path(folder.path) for folder in folders if folder.path != "/usr/bin" - ] + def filter_folders(folder: pathlib.Path) -> bool: + return ( + folder.as_posix() != "/usr/bin" + and not folder.is_file() + and folder.exists() + ) + + folders = reversed(self.project.get_python_path_folders()) + folder_paths = map(lambda folder: pathlib.Path(folder.real_path), folders) + folder_paths = filter(filter_folders, folder_paths) return list(OrderedDict.fromkeys(folder_paths)) def _get_available_packages(self) -> List[Package]: From 88b2c90fec65fcf68cd1026a158fc2277e1b52bb Mon Sep 17 00:00:00 2001 From: bageljr Date: Thu, 26 May 2022 16:06:13 +0530 Subject: [PATCH 2/5] fix: reformat --- rope/base/utils/pycompat.py | 1 - rope/contrib/autoimport/sqlite.py | 22 ++++++++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/rope/base/utils/pycompat.py b/rope/base/utils/pycompat.py index 5da280fe0..35d8ae394 100644 --- a/rope/base/utils/pycompat.py +++ b/rope/base/utils/pycompat.py @@ -34,7 +34,6 @@ def get_ast_arg_arg(node): def get_ast_with_items(node): return node.items - else: # PY2 string_types = (basestring,) diff --git a/rope/contrib/autoimport/sqlite.py b/rope/contrib/autoimport/sqlite.py index 5e5426430..0d00ff47e 100644 --- a/rope/contrib/autoimport/sqlite.py +++ b/rope/contrib/autoimport/sqlite.py @@ -11,13 +11,23 @@ from rope.base import exceptions, libutils, resourceobserver, taskhandle from rope.base.project import Project from rope.base.resources import Resource -from rope.contrib.autoimport.defs import (ModuleFile, Name, NameType, Package, - PackageType, SearchResult, Source) +from rope.contrib.autoimport.defs import ( + ModuleFile, + Name, + NameType, + Package, + PackageType, + SearchResult, + Source, +) from rope.contrib.autoimport.parse import get_names -from rope.contrib.autoimport.utils import (get_files, get_modname_from_path, - get_package_tuple, - sort_and_deduplicate, - sort_and_deduplicate_tuple) +from rope.contrib.autoimport.utils import ( + get_files, + get_modname_from_path, + get_package_tuple, + sort_and_deduplicate, + sort_and_deduplicate_tuple, +) from rope.refactor import importutils From 825e4f185ea27e4743ebf4000b4b373e97ceabd3 Mon Sep 17 00:00:00 2001 From: bageljr Date: Thu, 26 May 2022 16:13:02 +0530 Subject: [PATCH 3/5] unreverse --- rope/contrib/autoimport/sqlite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rope/contrib/autoimport/sqlite.py b/rope/contrib/autoimport/sqlite.py index 0d00ff47e..506627933 100644 --- a/rope/contrib/autoimport/sqlite.py +++ b/rope/contrib/autoimport/sqlite.py @@ -441,7 +441,7 @@ def filter_folders(folder: pathlib.Path) -> bool: and folder.exists() ) - folders = reversed(self.project.get_python_path_folders()) + folders = self.project.get_python_path_folders() folder_paths = map(lambda folder: pathlib.Path(folder.real_path), folders) folder_paths = filter(filter_folders, folder_paths) return list(OrderedDict.fromkeys(folder_paths)) From 50dad3214254e01ed8af8bb9908cea3cc84d6cf4 Mon Sep 17 00:00:00 2001 From: bageljr Date: Sun, 29 May 2022 08:16:27 +0530 Subject: [PATCH 4/5] check for is_dir --- rope/contrib/autoimport/sqlite.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rope/contrib/autoimport/sqlite.py b/rope/contrib/autoimport/sqlite.py index 506627933..07b0fcb98 100644 --- a/rope/contrib/autoimport/sqlite.py +++ b/rope/contrib/autoimport/sqlite.py @@ -436,9 +436,8 @@ def _del_if_exist(self, module_name, commit: bool = True): def _get_python_folders(self) -> List[pathlib.Path]: def filter_folders(folder: pathlib.Path) -> bool: return ( - folder.as_posix() != "/usr/bin" - and not folder.is_file() - and folder.exists() + folder.is_dir() + and folder.as_posix() != "/usr/bin" ) folders = self.project.get_python_path_folders() From 4a8fef197cf27ba61fb0716d11f4b13bdfa6754b Mon Sep 17 00:00:00 2001 From: bageljr Date: Sun, 29 May 2022 08:17:42 +0530 Subject: [PATCH 5/5] blacken --- rope/contrib/autoimport/sqlite.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rope/contrib/autoimport/sqlite.py b/rope/contrib/autoimport/sqlite.py index 07b0fcb98..b21e5fa0e 100644 --- a/rope/contrib/autoimport/sqlite.py +++ b/rope/contrib/autoimport/sqlite.py @@ -435,10 +435,7 @@ def _del_if_exist(self, module_name, commit: bool = True): def _get_python_folders(self) -> List[pathlib.Path]: def filter_folders(folder: pathlib.Path) -> bool: - return ( - folder.is_dir() - and folder.as_posix() != "/usr/bin" - ) + return folder.is_dir() and folder.as_posix() != "/usr/bin" folders = self.project.get_python_path_folders() folder_paths = map(lambda folder: pathlib.Path(folder.real_path), folders)