|
26 | 26 |
|
27 | 27 | import sys |
28 | 28 |
|
29 | | - |
30 | 29 | # Eager version check so we fail nicely before possible syntax errors |
31 | 30 | if sys.version_info < (3, 6): # noqa: UP036 |
32 | 31 | sys.stdout.write("Poetry installer requires Python 3.6 or newer to run!\n") |
|
47 | 46 | from functools import cmp_to_key |
48 | 47 | from io import UnsupportedOperation |
49 | 48 | from pathlib import Path |
50 | | -from typing import Optional |
51 | 49 | from urllib.request import Request |
52 | 50 | from urllib.request import urlopen |
53 | 51 |
|
54 | | - |
55 | 52 | SHELL = os.getenv("SHELL", "") |
56 | 53 | WINDOWS = sys.platform.startswith("win") or (sys.platform == "cli" and os.name == "nt") |
57 | 54 | MINGW = sysconfig.get_platform().startswith("mingw") |
@@ -288,7 +285,7 @@ def _get_win_folder_with_ctypes(csidl_name): |
288 | 285 |
|
289 | 286 |
|
290 | 287 | class PoetryInstallationError(RuntimeError): |
291 | | - def __init__(self, return_code: int = 0, log: Optional[str] = None): |
| 288 | + def __init__(self, return_code: int = 0, log: str | None = None): |
292 | 289 | super().__init__() |
293 | 290 | self.return_code = return_code |
294 | 291 | self.log = log |
@@ -492,12 +489,12 @@ class Installer: |
492 | 489 |
|
493 | 490 | def __init__( |
494 | 491 | self, |
495 | | - version: Optional[str] = None, |
| 492 | + version: str | None = None, |
496 | 493 | preview: bool = False, |
497 | 494 | force: bool = False, |
498 | 495 | accept_all: bool = False, |
499 | | - git: Optional[str] = None, |
500 | | - path: Optional[str] = None, |
| 496 | + git: str | None = None, |
| 497 | + path: str | None = None, |
501 | 498 | ) -> None: |
502 | 499 | self._version = version |
503 | 500 | self._preview = preview |
@@ -536,7 +533,7 @@ def run(self) -> int: |
536 | 533 | version = self._path |
537 | 534 | else: |
538 | 535 | try: |
539 | | - version, current_version = self.get_version() |
| 536 | + version, _current_version = self.get_version() |
540 | 537 | except ValueError: |
541 | 538 | return 1 |
542 | 539 |
|
@@ -735,7 +732,7 @@ def display_post_message_windows(self, version: str) -> None: |
735 | 732 | ) |
736 | 733 | ) |
737 | 734 |
|
738 | | - def get_windows_path_var(self) -> Optional[str]: |
| 735 | + def get_windows_path_var(self) -> str | None: |
739 | 736 | import winreg |
740 | 737 |
|
741 | 738 | with winreg.ConnectRegistry( |
|
0 commit comments