2525import os
2626import shutil
2727from collections .abc import Callable
28- from typing import Any , Optional
28+ from typing import Any
2929
3030from .utils import print_fake , syswork
3131
@@ -40,8 +40,8 @@ class Fetcher:
4040 def __init__ (
4141 self ,
4242 deps_dir : str ,
43- print_n : Optional [ Callable [..., None ]] = None ,
44- print_w : Optional [ Callable [..., None ]] = None ,
43+ print_n : Callable [..., None ] | None = None ,
44+ print_w : Callable [..., None ] | None = None ,
4545 ) -> None :
4646 """
4747 Parameters
@@ -85,9 +85,9 @@ def fetch(
8585 self ,
8686 name : str ,
8787 url : str ,
88- branch : Optional [ str ] = None ,
89- tag : Optional [ str ] = None ,
90- rev : Optional [ str ] = None ,
88+ branch : str | None = None ,
89+ tag : str | None = None ,
90+ rev : str | None = None ,
9191 update : bool = False ,
9292 ) -> str :
9393 """
@@ -141,7 +141,7 @@ def fetch(
141141 self .print_w ("Error merging updates for " + name + ":\n " + result [1 ])
142142 return dep_dir
143143
144- def build_dep (self , name : str , dep_dir : str , mode : Optional [ str ] = None ) -> None :
144+ def build_dep (self , name : str , dep_dir : str , mode : str | None = None ) -> None :
145145 """
146146 Build a dependency using FoBiS.py build.
147147
@@ -226,10 +226,10 @@ def _resolve_url(self, repo: str) -> str:
226226 def install_from_github (
227227 self ,
228228 repo : str ,
229- branch : Optional [ str ] = None ,
230- tag : Optional [ str ] = None ,
231- rev : Optional [ str ] = None ,
232- mode : Optional [ str ] = None ,
229+ branch : str | None = None ,
230+ tag : str | None = None ,
231+ rev : str | None = None ,
232+ mode : str | None = None ,
233233 update : bool = False ,
234234 no_build : bool = False ,
235235 prefix : str = "./" ,
@@ -276,7 +276,7 @@ def install_from_github(
276276 self ._build_dep_tracked (name , dep_dir , mode = mode )
277277 self ._install_artifacts (dep_dir , prefix , bin_dir , lib_dir , include_dir )
278278
279- def _build_dep_tracked (self , name : str , dep_dir : str , mode : Optional [ str ] = None ) -> None :
279+ def _build_dep_tracked (self , name : str , dep_dir : str , mode : str | None = None ) -> None :
280280 """
281281 Build a dependency using 'fobis build --track_build'.
282282
0 commit comments