Skip to content

Commit 291caaa

Browse files
Type Fix
1 parent 6c1aa21 commit 291caaa

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

installer.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
from distutils.dir_util import copy_tree
2+
from typing import Optional
3+
import distro
24
import logging
35
import os
46
import platform
@@ -8,10 +10,10 @@
810
from zipfile import ZipFile
911

1012

11-
class Installer:
13+
class Windows:
1214
base_link = 'http://apertium.projectjj.com/{}'
1315

14-
def __init__(self, languages): # type: (Installer, list) -> None
16+
def __init__(self, languages: list) -> None:
1517
self._install_path = os.getenv('LOCALAPPDATA')
1618
self._apertium_path = os.path.join(self._install_path, 'apertium-all-dev')
1719
self._download_path = tempfile.mkdtemp()
@@ -20,7 +22,7 @@ def __init__(self, languages): # type: (Installer, list) -> None
2022
self._logger = logging.getLogger()
2123
self._logger.setLevel(logging.DEBUG)
2224

23-
def _download_zips(self, download_files, extract_path): # type: (Installer, dict, str) -> None
25+
def _download_zips(self, download_files: dict, extract_path: Optional[str]) -> None:
2426
for zip_name, zip_link in download_files.items():
2527
zip_download_path = os.path.join(self._download_path, zip_name)
2628
urlretrieve(Installer.base_link.format(zip_link), filename=zip_download_path)
@@ -33,7 +35,7 @@ def _download_zips(self, download_files, extract_path): # type: (Installer, dic
3335
os.remove(zip_download_path)
3436
self._logger.info('%s removed', zip_name)
3537

36-
def _download_apertium_windows(self): # type: (Installer) -> None
38+
def _download_apertium_windows(self) -> None:
3739
"""Installs Apertium-all-dev to %localappdata%"""
3840

3941
apertium_windows = {
@@ -42,7 +44,7 @@ def _download_apertium_windows(self): # type: (Installer) -> None
4244

4345
self._download_zips(apertium_windows, self._install_path)
4446

45-
def _download_package(self): # type: (Installer) -> None
47+
def _download_package(self) -> None:
4648
"""Installs Language Data to Apertium"""
4749

4850
if platform.system() == 'Windows':
@@ -67,7 +69,7 @@ def _download_package(self): # type: (Installer) -> None
6769

6870
shutil.rmtree(os.path.join(self._download_path, 'usr'))
6971

70-
def _edit_modes(self): # type: (Installer) -> None
72+
def _edit_modes(self) -> None:
7173
r"""The mode files need to be modified before being used on Windows System
7274
7375
1. Replace /usr/share with %localappdata%\apertium-all-dev\share

0 commit comments

Comments
 (0)