Switch to directly importing vendored packages instead of patching sys.path

Author: Secrus

pyproject.toml

@@ -120,7 +120,7 @@ ignore_missing_imports = true
 [tool.vendoring]
 destination = "src/poetry/core/_vendor/"
 requirements = "src/poetry/core/_vendor/vendor.txt"
-namespace = ""
+namespace = "poetry.core._vendor"
 
 protected-files = ["vendor.txt"]
 patches-dir = "vendors/patches"

src/poetry/core/__init__.py

@@ -1,15 +1,6 @@
 from __future__ import annotations
 
-import sys
-
-from pathlib import Path
-
 
 # this cannot presently be replaced with importlib.metadata.version as when building
 # itself, poetry-core is not available as an installed distribution.
 __version__ = "1.9.0"
-
-__vendor_site__ = (Path(__file__).parent / "_vendor").as_posix()
-
-if __vendor_site__ not in sys.path:
-    sys.path.insert(0, __vendor_site__)

src/poetry/core/_vendor/fastjsonschema/__init__.py

@@ -78,7 +78,7 @@
 
 .. code-block:: python
 
-    import fastjsonschema
+    from poetry.core._vendor import fastjsonschema
 
     point_schema = {
         "type": "object",
@@ -132,7 +132,7 @@ def validate(definition, data, handlers={}, formats={}, use_default=True, use_fo
 
     .. code-block:: python
 
-        import fastjsonschema
+        from poetry.core._vendor import fastjsonschema
 
         fastjsonschema.validate({'type': 'string'}, 'hello')
         # same as: compile({'type': 'string'})('hello')
@@ -151,7 +151,7 @@ def compile(definition, handlers={}, formats={}, use_default=True, use_formats=T
 
     .. code-block:: python
 
-        import fastjsonschema
+        from poetry.core._vendor import fastjsonschema
 
         validate = fastjsonschema.compile({'type': 'string'})
         validate('hello')
@@ -224,7 +224,7 @@ def compile_to_code(definition, handlers={}, formats={}, use_default=True, use_f
 
     .. code-block:: python
 
-        import fastjsonschema
+        from poetry.core._vendor import fastjsonschema
 
         code = fastjsonschema.compile_to_code({'type': 'string'})
         with open('your_file.py', 'w') as f:

src/poetry/core/_vendor/lark/ast_utils.py

@@ -6,7 +6,7 @@
 import types
 from typing import Optional, Callable
 
-from lark import Transformer, v_args
+from poetry.core._vendor.lark import Transformer, v_args
 
 class Ast:
     """Abstract class

src/poetry/core/_vendor/lark/load_grammar.py

@@ -861,7 +861,7 @@ def __call__(self, base_path: Union[None, str, PackageResource], grammar_path: s
         raise IOError('Cannot find grammar in given paths') from err
 
 
-stdlib_loader = FromPackageLoader('lark', IMPORT_PATHS)
+stdlib_loader = FromPackageLoader('poetry.core._vendor.lark', IMPORT_PATHS)
 
 
 

src/poetry/core/_vendor/lark/parsers/lalr_interactive_parser.py

@@ -4,8 +4,8 @@
 from copy import copy
 import warnings
 
-from lark.exceptions import UnexpectedToken
-from lark.lexer import Token, LexerThread
+from poetry.core._vendor.lark.exceptions import UnexpectedToken
+from poetry.core._vendor.lark.lexer import Token, LexerThread
 
 ###{standalone
 

src/poetry/core/_vendor/lark/parsers/lalr_parser.py

@@ -9,7 +9,7 @@
 
 from .lalr_analysis import LALR_Analyzer, IntParseTable, ParseTableBase
 from .lalr_interactive_parser import InteractiveParser
-from lark.exceptions import UnexpectedCharacters, UnexpectedInput, UnexpectedToken
+from poetry.core._vendor.lark.exceptions import UnexpectedCharacters, UnexpectedInput, UnexpectedToken
 from .lalr_parser_state import ParserState, ParseConf
 
 ###{standalone

src/poetry/core/_vendor/lark/parsers/lalr_parser_state.py

@@ -4,7 +4,7 @@
 from ..common import ParserCallbacks
 
 from .lalr_analysis import Shift, ParseTableBase, StateT
-from lark.exceptions import UnexpectedToken
+from poetry.core._vendor.lark.exceptions import UnexpectedToken
 
 ###{standalone
 

src/poetry/core/_vendor/lark/tools/__init__.py

@@ -5,7 +5,7 @@
 from typing import Optional
 import warnings
 
-from lark import Lark, logger
+from poetry.core._vendor.lark import Lark, logger
 try:
     from interegular import logger as interegular_logger
     has_interegular = True

src/poetry/core/_vendor/lark/tools/nearley.py

@@ -6,7 +6,7 @@
 import argparse
 
 
-from lark import Lark, Transformer, v_args
+from poetry.core._vendor.lark import Lark, Transformer, v_args
 
 nearley_grammar = r"""
     start: (ruledef|directive)+