From 91f110e8426fe82233a31de994e6853f9e4630cf Mon Sep 17 00:00:00 2001 From: Steven Arcangeli Date: Sat, 6 Jan 2024 10:30:32 -0800 Subject: [PATCH] fix: auto-install typing-extensions on all python versions (#18) --- rplugin/python3/gkeep/__init__.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/rplugin/python3/gkeep/__init__.py b/rplugin/python3/gkeep/__init__.py index 6dfa32b..7dedbf5 100644 --- a/rplugin/python3/gkeep/__init__.py +++ b/rplugin/python3/gkeep/__init__.py @@ -31,24 +31,18 @@ def __getattr__(self, key: str) -> Any: try: import gkeepapi import keyring - - if sys.version_info < (3, 8): - import typing_extensions + import typing_extensions except ImportError: # gpsoauth doesn't work with urllib3 2.0 - modules = ["urllib3<2.0", "gkeepapi", "keyring"] - if sys.version_info < (3, 8): - modules.append("typing-extensions") + modules = ["urllib3<2.0", "gkeepapi", "keyring", "typing-extensions"] subprocess.call([sys.executable, "-m", "pip", "install", "-q"] + modules) try: import gkeepapi import keyring - - if sys.version_info < (3, 8): - import typing_extensions + import typing_extensions except ImportError as e: raise ImportError( - "Could not auto-install gkeepapi and keyring. Please `pip install gkeepapi keyring` in your neovim python environment" + "Could not auto-install gkeepapi, keyring, and typing_extensions. Please `pip install gkeepapi keyring typing_extensions` in your neovim python environment" ) from e from gkeep.plugin import GkeepPlugin