Deluge
diff options
| author | Calum Lind <calumlind+deluge@gmail.com> | 2021-01-17 15:48:35 +0000 |
|---|---|---|
| committer | Calum Lind <calumlind+deluge@gmail.com> | 2021-01-24 20:40:20 +0000 |
| commit | 610a1bb3139f8ded69561b290d7ce61b5a039676 (patch) | |
| tree | 4e18e880de320e248e0f079adab74fe1c67157f8 /deluge/core/core.py | |
| parent | 23a48dd01c86ef01cd1d13371de51247ec9a503b (diff) | |
| download | deluge-610a1bb3139f8ded69561b290d7ce61b5a039676.tar.gz deluge-610a1bb3139f8ded69561b290d7ce61b5a039676.tar.bz2 deluge-610a1bb3139f8ded69561b290d7ce61b5a039676.zip | |
[Lint] Update pre-commit hook and isort versions
* Fixed black hook requiring Py3.6 to installed locally. Will now assume
Py3.6+ in installed.
* Added isort traceback in pre-commit flake8 hook fails
* Updated versions of Black, Prettier and isort
* Keep Flake8 at 3.7.9 due to E402 issue: https://gitlab.com/pycqa/flake8/-/issues/638
* New pyproject config for isort v5 with fixes for Python 2 imports.
* Fixed travis config to run Python 3.6 for lint run. Replaced the
virtualenv with_system_site_packages config with Travis specific Python
config value so lint run doesn't attempt to append with_system_site_packages
to Python 3.6 command.
Diffstat (limited to 'deluge/core/core.py')
| -rw-r--r-- | deluge/core/core.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/deluge/core/core.py b/deluge/core/core.py index 8498ff9a8..2160f769a 100644 --- a/deluge/core/core.py +++ b/deluge/core/core.py @@ -57,10 +57,10 @@ from deluge.event import ( from deluge.httpdownloader import download_file try: - from urllib.request import urlopen, URLError + from urllib.request import URLError, urlopen except ImportError: # PY2 fallback - from urllib2 import urlopen, URLError + from urllib2 import URLError, urlopen log = logging.getLogger(__name__) |