sorted imports

Makefile

@@ -47,15 +47,13 @@ clean-test: ## remove test and coverage artifacts
 	rm -fr htmlcov/
 	rm -fr .pytest_cache
 
-lint: ## check style with flake8
+format: ## format with black
+	poetry run isort .
 	poetry run black deep_translator tests
 
 test: ## run tests quickly with the default Python
 	pytest
 
-test-all: ## run tests on every Python version with tox
-	tox
-
 coverage: ## check code coverage quickly with the default Python
 	coverage run --source deep_translator -m pytest
 	coverage report -m

deep_translator/__init__.py

@@ -1,16 +1,16 @@
 """Top-level package for Deep Translator"""
 
+from deep_translator.deepl import DeeplTranslator
+from deep_translator.detection import batch_detection, single_detection
 from deep_translator.google import GoogleTranslator
-from deep_translator.pons import PonsTranslator
+from deep_translator.libre import LibreTranslator
 from deep_translator.linguee import LingueeTranslator
-from deep_translator.mymemory import MyMemoryTranslator
-from deep_translator.yandex import YandexTranslator
-from deep_translator.qcri import QcriTranslator
-from deep_translator.deepl import DeeplTranslator
-from deep_translator.detection import single_detection, batch_detection
 from deep_translator.microsoft import MicrosoftTranslator
+from deep_translator.mymemory import MyMemoryTranslator
 from deep_translator.papago import PapagoTranslator
-from deep_translator.libre import LibreTranslator
+from deep_translator.pons import PonsTranslator
+from deep_translator.qcri import QcriTranslator
+from deep_translator.yandex import YandexTranslator
 
 __author__ = """Nidhal Baccouri"""
 __email__ = "[email protected]"

deep_translator/base.py

@@ -1,9 +1,10 @@
 """base translator class"""
 
+from abc import ABC, abstractmethod
+from typing import List, Optional, Union
+
 from deep_translator.constants import GOOGLE_LANGUAGES_TO_CODES
 from deep_translator.exceptions import InvalidSourceOrTargetLanguage
-from abc import ABC, abstractmethod
-from typing import Optional, List, Union
 
 
 class BaseTranslator(ABC):

deep_translator/cli.py

@@ -1,8 +1,9 @@
 """Console script for deep_translator."""
 import argparse
-from deep_translator.engines import __engines__
 from typing import Optional
 
+from deep_translator.engines import __engines__
+
 
 class CLI(object):
     translators_dict = __engines__

deep_translator/deepl.py

@@ -1,13 +1,15 @@
+from typing import List, Optional
+
 import requests
-from typing import Optional, List
-from deep_translator.validate import is_empty, is_input_valid
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, DEEPL_LANGUAGE_TO_CODE
 from deep_translator.exceptions import (
+    AuthorizationException,
     ServerException,
     TranslationNotFound,
-    AuthorizationException,
 )
-from deep_translator.base import BaseTranslator
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class DeeplTranslator(BaseTranslator):

deep_translator/detection.py

@@ -1,10 +1,10 @@
 """
 language detection API
 """
+from typing import List, Optional, Union
+
 import requests
 from requests.exceptions import HTTPError
-from typing import Optional, List, Union
-
 
 # Module global config
 config = {

deep_translator/google.py

@@ -2,17 +2,19 @@
 google translator API
 """
 
+from typing import List, Optional
+
+import requests
+from bs4 import BeautifulSoup
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS
 from deep_translator.exceptions import (
+    RequestError,
     TooManyRequests,
     TranslationNotFound,
-    RequestError,
 )
-from deep_translator.base import BaseTranslator
-from deep_translator.validate import is_input_valid, is_empty
-from bs4 import BeautifulSoup
-import requests
-from typing import Optional, List
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class GoogleTranslator(BaseTranslator):

deep_translator/libre.py

@@ -2,16 +2,18 @@
 LibreTranslate API
 """
 
+from typing import List, Optional
+
 import requests
-from typing import Optional, List
-from deep_translator.validate import is_empty, is_input_valid
+
 from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, LIBRE_LANGUAGES_TO_CODES
 from deep_translator.exceptions import (
+    AuthorizationException,
     ServerException,
     TranslationNotFound,
-    AuthorizationException,
 )
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class LibreTranslator(BaseTranslator):

deep_translator/linguee.py

@@ -1,20 +1,22 @@
 """
 linguee translator API
 """
-from deep_translator.validate import is_input_valid, is_empty
+from typing import List, Optional, Union
+
+import requests
+from bs4 import BeautifulSoup
+from requests.utils import requote_uri
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, LINGUEE_LANGUAGES_TO_CODES
 from deep_translator.exceptions import (
-    TranslationNotFound,
-    NotValidPayload,
     ElementNotFoundInGetRequest,
+    NotValidPayload,
     RequestError,
     TooManyRequests,
+    TranslationNotFound,
 )
-from deep_translator.base import BaseTranslator
-from bs4 import BeautifulSoup
-import requests
-from requests.utils import requote_uri
-from typing import Optional, List, Union
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class LingueeTranslator(BaseTranslator):

deep_translator/microsoft.py

@@ -1,13 +1,15 @@
 # -*- coding: utf-8 -*-
 
-import requests
 import logging
 import sys
-from deep_translator.constants import BASE_URLS
-from deep_translator.exceptions import ServerException, MicrosoftAPIerror
+from typing import List, Optional
+
+import requests
+
 from deep_translator.base import BaseTranslator
+from deep_translator.constants import BASE_URLS
+from deep_translator.exceptions import MicrosoftAPIerror, ServerException
 from deep_translator.validate import is_input_valid
-from typing import Optional, List
 
 
 class MicrosoftTranslator(BaseTranslator):

deep_translator/mymemory.py

@@ -1,16 +1,18 @@
 """
 mymemory translator API
 """
-from deep_translator.validate import is_empty, is_input_valid
+from typing import List, Optional, Union
+
+import requests
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS
 from deep_translator.exceptions import (
-    TranslationNotFound,
     RequestError,
     TooManyRequests,
+    TranslationNotFound,
 )
-from deep_translator.base import BaseTranslator
-import requests
-from typing import Optional, List, Union
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class MyMemoryTranslator(BaseTranslator):

deep_translator/papago.py

@@ -2,11 +2,13 @@
 google translator API
 """
 import json
+from typing import List, Optional
+
+import requests
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, PAPAGO_LANGUAGE_TO_CODE
 from deep_translator.exceptions import TranslationNotFound
-from deep_translator.base import BaseTranslator
-import requests
-from typing import Optional, List
 from deep_translator.validate import is_input_valid
 
 

deep_translator/pons.py

@@ -1,21 +1,22 @@
 """
 pons translator API
 """
-from bs4 import BeautifulSoup
+from typing import List, Optional, Union
+
 import requests
+from bs4 import BeautifulSoup
+from requests.utils import requote_uri
 
-from deep_translator.validate import is_input_valid, is_empty
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, PONS_CODES_TO_LANGUAGES
 from deep_translator.exceptions import (
-    TranslationNotFound,
-    NotValidPayload,
     ElementNotFoundInGetRequest,
+    NotValidPayload,
     RequestError,
     TooManyRequests,
+    TranslationNotFound,
 )
-from deep_translator.base import BaseTranslator
-from requests.utils import requote_uri
-from typing import Optional, Union, List
+from deep_translator.validate import is_empty, is_input_valid
 
 
 class PonsTranslator(BaseTranslator):

deep_translator/qcri.py

@@ -1,8 +1,10 @@
+from typing import List, Optional
+
 import requests
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS, QCRI_LANGUAGE_TO_CODE
 from deep_translator.exceptions import ServerException, TranslationNotFound
-from deep_translator.base import BaseTranslator
-from typing import Optional, List
 
 
 class QcriTranslator(BaseTranslator):

deep_translator/validate.py

@@ -1,4 +1,4 @@
-from deep_translator.exceptions import NotValidPayload, NotValidLength
+from deep_translator.exceptions import NotValidLength, NotValidPayload
 
 
 def is_empty(text: str) -> bool:

deep_translator/yandex.py

@@ -1,17 +1,19 @@
 """
 Yandex translator API
 """
+from typing import List, Optional
+
 import requests
+
+from deep_translator.base import BaseTranslator
 from deep_translator.constants import BASE_URLS
 from deep_translator.exceptions import (
     RequestError,
     ServerException,
-    TranslationNotFound,
     TooManyRequests,
+    TranslationNotFound,
 )
-from deep_translator.base import BaseTranslator
 from deep_translator.validate import is_input_valid
-from typing import Optional, List
 
 
 class YandexTranslator(BaseTranslator):

docs/conf.py

@@ -19,6 +19,7 @@
 #
 import os
 import sys
+
 sys.path.insert(0, os.path.abspath('..'))
 
 # import deep_translator
@@ -58,6 +59,7 @@ author = "Nidhal Baccouri"
 #
 # The short X.Y version.
 import toml
+
 with open("../pyproject.toml", "r") as f:
     tom = toml.load(f)
 version = tom['tool']['poetry']['version']

examples/linguee.py

@@ -1,7 +1,6 @@
 
 from deep_translator import LingueeTranslator
 
-
 res = LingueeTranslator(source='de', target='en').translate('laufen', return_all=False)
 
 print(res)

examples/mymemory.py

@@ -1,7 +1,6 @@
 
 from deep_translator import MyMemoryTranslator
 
-
 res = MyMemoryTranslator(source='ar', target='en').translate('آخُذ اَلْباص.')
 
 print(res)

examples/pons.py

@@ -1,7 +1,6 @@
 
 from deep_translator import PonsTranslator
 
-
 res = PonsTranslator(source='en', target='de').translate('good', return_all=False)
 
 print(res)

examples/trans.py

@@ -1,5 +1,4 @@
-from deep_translator import GoogleTranslator, PonsTranslator, LingueeTranslator
-
+from deep_translator import GoogleTranslator, LingueeTranslator, PonsTranslator
 
 # examples using google translate
 

poetry.lock

@@ -219,6 +219,20 @@ category = "dev"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "isort"
+version = "5.10.1"
+description = "A Python utility / library to sort Python imports."
+category = "dev"
+optional = false
+python-versions = ">=3.6.1,<4.0"
+
+[package.extras]
+pipfile_deprecated_finder = ["pipreqs", "requirementslib"]
+requirements_deprecated_finder = ["pipreqs", "pip-api"]
+colors = ["colorama (>=0.4.3,<0.5.0)"]
+plugins = ["setuptools"]
+
 [[package]]
 name = "jeepney"
 version = "0.7.1"
@@ -720,7 +734,7 @@ testing = ["pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-flake8", "pytest-
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "465ff9b79ec7a4f8f67638bed33190079fbe1dcca8261d36813c7787e30624f2"
+content-hash = "999f9269962bc8ce6f5ad597f7aa7afc6d5a4382b8cadfd8ffe75cd8ed16a41e"
 
 [metadata.files]
 alabaster = [
@@ -936,6 +950,10 @@ iniconfig = [
     {file = "iniconfig-1.1.1-py2.py3-none-any.whl", hash = "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3"},
     {file = "iniconfig-1.1.1.tar.gz", hash = "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32"},
 ]
+isort = [
+    {file = "isort-5.10.1-py3-none-any.whl", hash = "sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7"},
+    {file = "isort-5.10.1.tar.gz", hash = "sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"},
+]
 jeepney = [
     {file = "jeepney-0.7.1-py3-none-any.whl", hash = "sha256:1b5a0ea5c0e7b166b2f5895b91a08c14de8915afda4407fb5022a195224958ac"},
     {file = "jeepney-0.7.1.tar.gz", hash = "sha256:fa9e232dfa0c498bd0b8a3a73b8d8a31978304dcef0515adc859d4e096f96f4f"},

pyproject.toml

@@ -41,6 +41,7 @@ pytest = "^6.2.4"
 pytest-runner = "^5.3.1"
 toml = "^0.10.2"
 black = "^22.1.0"
+isort = "^5.10.1"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]

tests/test_cli.py

@@ -2,10 +2,12 @@
 
 """Tests for the CLI interface."""
 
-from deep_translator.cli import CLI
-import pytest
 import sys
 
+import pytest
+
+from deep_translator.cli import CLI
+
 
 @pytest.fixture
 def mock_args():

tests/test_deepl.py

@@ -1,5 +1,7 @@
-import pytest
 from unittest.mock import Mock, patch
+
+import pytest
+
 from deep_translator.deepl import DeeplTranslator
 from deep_translator.exceptions import AuthorizationException
 

tests/test_google.py

@@ -3,7 +3,8 @@
 """Tests for `deep_translator` package."""
 
 import pytest
-from deep_translator import exceptions, GoogleTranslator
+
+from deep_translator import GoogleTranslator, exceptions
 from deep_translator.constants import GOOGLE_LANGUAGES_TO_CODES
 
 

tests/test_libre.py

@@ -3,7 +3,8 @@
 """Tests for `deep_translator` package."""
 
 import pytest
-from deep_translator import exceptions, LibreTranslator
+
+from deep_translator import LibreTranslator, exceptions
 from deep_translator.constants import LIBRE_LANGUAGES_TO_CODES
 
 

tests/test_linguee.py

@@ -3,7 +3,8 @@
 """Tests for `deep_translator` package."""
 
 import pytest
-from deep_translator import exceptions, LingueeTranslator
+
+from deep_translator import LingueeTranslator, exceptions
 
 
 @pytest.fixture

tests/test_microsoft_trans.py

@@ -2,11 +2,12 @@
 
 """Tests for `deep_translator` package."""
 
-import pytest
 from unittest.mock import patch
+
+import pytest
 import requests
 
-from deep_translator import exceptions, MicrosoftTranslator
+from deep_translator import MicrosoftTranslator, exceptions
 
 
 # mocked request.post

tests/test_mymemory.py

@@ -3,7 +3,8 @@
 """Tests for `deep_translator` package."""
 
 import pytest
-from deep_translator import exceptions, MyMemoryTranslator
+
+from deep_translator import MyMemoryTranslator, exceptions
 
 
 @pytest.fixture

tests/test_pons.py

@@ -3,7 +3,8 @@
 """Tests for `deep_translator` package."""
 
 import pytest
-from deep_translator import exceptions, PonsTranslator
+
+from deep_translator import PonsTranslator, exceptions
 
 
 @pytest.fixture