From 139a261f27939f5018cb4c8857edc245e7e025ae Mon Sep 17 00:00:00 2001 From: "Marco, Chang" <35587460+triper1022@users.noreply.github.com> Date: Tue, 22 Jun 2021 08:20:29 +0900 Subject: [PATCH 1/3] Update user_specific_imports.py --- src/pyforest/user_specific_imports.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/pyforest/user_specific_imports.py b/src/pyforest/user_specific_imports.py index 6350b20..c3264d3 100644 --- a/src/pyforest/user_specific_imports.py +++ b/src/pyforest/user_specific_imports.py @@ -59,8 +59,24 @@ def _get_imports_from_user_settings(user_imports_path) -> list: return _get_imports(file_lines) -def _assign_imports_to_globals(import_statements: list, globals_) -> None: - symbols = [import_statement.split()[-1] for import_statement in import_statements] +def _assign_imports_to_globals(import_statements: list) -> None: + symbols = []; new_import_statements = [] + + for import_statement in import_statements: + def process(statement): + symbols.append(statement.split()[-1]) + new_import_statements.append(statement) + + if "," not in import_statement: + process(import_statement) + else: + multi_import_statement = import_statement.split(",") + splited_statement = multi_import_statement[0].split() + for i in range(len(multi_import_statement)): + if not i: process(multi_import_statement[0]) + else: + new_statement = splited_statement[:-1] + [multi_import_statement[i]] + process(" ".join(new_statement)) for symbol, import_statement in zip(symbols, import_statements): exec(f"{symbol} = LazyImport('{import_statement}')", globals_) From 20aa1c8dfff1337319002c003ebaad4b212f4f7a Mon Sep 17 00:00:00 2001 From: "Marco, Chang" <35587460+triper1022@users.noreply.github.com> Date: Tue, 22 Jun 2021 09:44:28 +0900 Subject: [PATCH 2/3] Update user_specific_imports.py --- src/pyforest/user_specific_imports.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pyforest/user_specific_imports.py b/src/pyforest/user_specific_imports.py index c3264d3..a4d9720 100644 --- a/src/pyforest/user_specific_imports.py +++ b/src/pyforest/user_specific_imports.py @@ -59,7 +59,7 @@ def _get_imports_from_user_settings(user_imports_path) -> list: return _get_imports(file_lines) -def _assign_imports_to_globals(import_statements: list) -> None: +def _assign_imports_to_globals(import_statements: list, globals_) -> None: symbols = []; new_import_statements = [] for import_statement in import_statements: @@ -78,7 +78,7 @@ def process(statement): new_statement = splited_statement[:-1] + [multi_import_statement[i]] process(" ".join(new_statement)) - for symbol, import_statement in zip(symbols, import_statements): + for symbol, import_statement in zip(symbols, new_import_statements): exec(f"{symbol} = LazyImport('{import_statement}')", globals_) From 6e8e8bd86b6090782788faf5df294cc79ea18d52 Mon Sep 17 00:00:00 2001 From: "Marco, Chang" <35587460+triper1022@users.noreply.github.com> Date: Thu, 24 Jun 2021 09:39:36 +0900 Subject: [PATCH 3/3] Update user_specific_imports.py --- src/pyforest/user_specific_imports.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/pyforest/user_specific_imports.py b/src/pyforest/user_specific_imports.py index a4d9720..2509862 100644 --- a/src/pyforest/user_specific_imports.py +++ b/src/pyforest/user_specific_imports.py @@ -72,11 +72,10 @@ def process(statement): else: multi_import_statement = import_statement.split(",") splited_statement = multi_import_statement[0].split() - for i in range(len(multi_import_statement)): - if not i: process(multi_import_statement[0]) - else: - new_statement = splited_statement[:-1] + [multi_import_statement[i]] - process(" ".join(new_statement)) + process(multi_import_statement[0]) + for i in range(1, len(multi_import_statement)): + new_statement = splited_statement[:-1] + [multi_import_statement[i]] + process(" ".join(new_statement)) for symbol, import_statement in zip(symbols, new_import_statements): exec(f"{symbol} = LazyImport('{import_statement}')", globals_)