From 44791439a599c127d7d3638cbb85f5551a964642 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Tue, 4 Feb 2020 01:06:19 +0100 Subject: [PATCH] Drop Python 2 support: Obsolete future statements --- .staticsite.py | 2 -- dosage | 3 --- dosagelib/__init__.py | 1 - dosagelib/cmd.py | 3 --- dosagelib/comic.py | 3 --- dosagelib/configuration.py | 3 --- dosagelib/director.py | 3 --- dosagelib/events.py | 3 --- dosagelib/helpers.py | 3 --- dosagelib/http.py | 3 --- dosagelib/languages.py | 1 - dosagelib/loader.py | 3 --- dosagelib/output.py | 3 --- dosagelib/plugins/a.py | 3 --- dosagelib/plugins/arcamax.py | 3 --- dosagelib/plugins/b.py | 3 --- dosagelib/plugins/c.py | 3 --- dosagelib/plugins/clonemanga.py | 3 --- dosagelib/plugins/comicfury.py | 3 --- dosagelib/plugins/comicgenesis.py | 3 --- dosagelib/plugins/comicsherpa.py | 3 --- dosagelib/plugins/comicskingdom.py | 3 --- dosagelib/plugins/common.py | 3 --- dosagelib/plugins/creators.py | 3 --- dosagelib/plugins/cyantian.py | 3 --- dosagelib/plugins/d.py | 3 --- dosagelib/plugins/derideal.py | 3 --- dosagelib/plugins/dmfa.py | 3 --- dosagelib/plugins/e.py | 3 --- dosagelib/plugins/f.py | 2 -- dosagelib/plugins/footloosecomic.py | 2 -- dosagelib/plugins/g.py | 3 --- dosagelib/plugins/gocomics.py | 3 --- dosagelib/plugins/h.py | 3 --- dosagelib/plugins/i.py | 3 --- dosagelib/plugins/j.py | 3 --- dosagelib/plugins/k.py | 3 --- dosagelib/plugins/keenspot.py | 3 --- dosagelib/plugins/kemonocafe.py | 3 --- dosagelib/plugins/l.py | 3 --- dosagelib/plugins/m.py | 3 --- dosagelib/plugins/n.py | 3 --- dosagelib/plugins/namirdeiter.py | 3 --- dosagelib/plugins/nitrocosm.py | 3 --- dosagelib/plugins/nuklearpower.py | 3 --- dosagelib/plugins/num.py | 3 --- dosagelib/plugins/o.py | 3 --- dosagelib/plugins/old.py | 3 --- dosagelib/plugins/p.py | 3 --- dosagelib/plugins/petitesymphony.py | 3 --- dosagelib/plugins/projectfuture.py | 3 --- dosagelib/plugins/q.py | 3 --- dosagelib/plugins/r.py | 3 --- dosagelib/plugins/rhjunior.py | 3 --- dosagelib/plugins/s.py | 3 --- dosagelib/plugins/sandraandwoo.py | 3 --- dosagelib/plugins/smackjeeves.py | 3 --- dosagelib/plugins/snafu.py | 3 --- dosagelib/plugins/studiokhimera.py | 3 --- dosagelib/plugins/t.py | 3 --- dosagelib/plugins/u.py | 5 +---- dosagelib/plugins/v.py | 2 -- dosagelib/plugins/w.py | 3 --- dosagelib/plugins/webcomicfactory.py | 3 --- dosagelib/plugins/webtoons.py | 3 --- dosagelib/plugins/wlpcomics.py | 3 --- dosagelib/plugins/wumo.py | 3 --- dosagelib/plugins/x.py | 3 --- dosagelib/plugins/y.py | 3 --- dosagelib/plugins/z.py | 3 --- dosagelib/rss.py | 3 --- dosagelib/scraper.py | 3 --- dosagelib/singleton.py | 3 --- dosagelib/updater.py | 3 --- dosagelib/util.py | 3 --- scripts/arcamax.py | 1 - scripts/comicfury.py | 1 - scripts/comicsherpa.py | 1 - scripts/comicskingdom.py | 1 - scripts/create-cbz.py | 1 - scripts/creators.py | 1 - scripts/gocomics.py | 1 - scripts/hook-dosagelib.py | 2 -- scripts/keenspot.py | 1 - scripts/mklanguages.py | 3 --- scripts/order-symlinks.py | 2 -- scripts/scriptutil.py | 3 --- scripts/webcomicfactory.py | 2 -- scripts/webtoons.py | 2 -- setup.py | 3 --- tests/conftest.py | 3 --- tests/httpmocks.py | 3 --- tests/modules/check_comics.py | 3 --- tests/modules/conftest.py | 4 ---- tests/test_comicnames.py | 3 --- tests/test_dosage.py | 3 --- tests/test_helpers.py | 3 --- tests/test_modules.py | 3 --- tests/test_rss.py | 3 --- tests/test_scraper.py | 3 --- tests/test_singletoninstance.py | 3 --- tests/test_util.py | 3 --- tests/test_vote.py | 3 --- 103 files changed, 1 insertion(+), 283 deletions(-) mode change 100755 => 100644 dosagelib/comic.py mode change 100755 => 100644 dosagelib/plugins/m.py diff --git a/.staticsite.py b/.staticsite.py index 176149f54..9227f6ece 100644 --- a/.staticsite.py +++ b/.staticsite.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import absolute_import, division, print_function - SITE_NAME = "dosage" SITE_SUB = "a comic downloader and archiver" SITE_AUTHOR = "Tobias Gruetzmacher" diff --git a/dosage b/dosage index 74a0038b5..95f1092f5 100755 --- a/dosage +++ b/dosage @@ -9,9 +9,6 @@ # / /_// (_) \__ \ (_| | (_| | __/ # /___,' \___/|___/\__,_|\__, |\___| # |___/ - -from __future__ import absolute_import, division, print_function - import sys from dosagelib.cmd import main diff --git a/dosagelib/__init__.py b/dosagelib/__init__.py index f2f53eeff..e58ab4680 100644 --- a/dosagelib/__init__.py +++ b/dosagelib/__init__.py @@ -13,7 +13,6 @@ your intentions, and received permission to distribute. The primary interface is the 'dosage' commandline script. Comic modules for each comic are located in L{dosagelib.plugins}. """ -from __future__ import absolute_import, division, print_function try: from importlib.metadata import version, PackageNotFoundError diff --git a/dosagelib/cmd.py b/dosagelib/cmd.py index b75e767f6..4b741e80d 100644 --- a/dosagelib/cmd.py +++ b/dosagelib/cmd.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import argparse import os diff --git a/dosagelib/comic.py b/dosagelib/comic.py old mode 100755 new mode 100644 index acc842195..201e0a98c --- a/dosagelib/comic.py +++ b/dosagelib/comic.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import os import glob import codecs diff --git a/dosagelib/configuration.py b/dosagelib/configuration.py index f40179455..ff05b1b56 100644 --- a/dosagelib/configuration.py +++ b/dosagelib/configuration.py @@ -5,9 +5,6 @@ """ Define basic configuration data like version or application name. """ - -from __future__ import absolute_import, division, print_function - from . import AppName, __version__ App = AppName + u' ' + __version__ diff --git a/dosagelib/director.py b/dosagelib/director.py index a94105995..b678b5289 100644 --- a/dosagelib/director.py +++ b/dosagelib/director.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import os import threading import _thread diff --git a/dosagelib/events.py b/dosagelib/events.py index 94c1f54c7..87859e7bb 100644 --- a/dosagelib/events.py +++ b/dosagelib/events.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import os import time from urllib.parse import quote as url_quote diff --git a/dosagelib/helpers.py b/dosagelib/helpers.py index ad6b03530..cee457f89 100644 --- a/dosagelib/helpers.py +++ b/dosagelib/helpers.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .util import getQueryParams diff --git a/dosagelib/http.py b/dosagelib/http.py index 9fe10ba2f..a324863e0 100644 --- a/dosagelib/http.py +++ b/dosagelib/http.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from collections import defaultdict from random import uniform from time import time, sleep diff --git a/dosagelib/languages.py b/dosagelib/languages.py index d31e1b6e9..c1295dddc 100644 --- a/dosagelib/languages.py +++ b/dosagelib/languages.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # ISO 693-1 language codes from pycountry # This file is automatically generated, DO NOT EDIT! -from __future__ import absolute_import, division, print_function Languages = { 'de': 'German', 'en': 'English', diff --git a/dosagelib/loader.py b/dosagelib/loader.py index 7c8cc61d9..79a3d934e 100644 --- a/dosagelib/loader.py +++ b/dosagelib/loader.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2016-2019 Tobias Gruetzmacher - """ Functions to load plugin modules. @@ -9,8 +8,6 @@ Example usage: modules = loader.get_modules('plugins') plugins = loader.get_plugins(modules, PluginClass) """ - -from __future__ import absolute_import, division, print_function import importlib import pkgutil from .output import out diff --git a/dosagelib/output.py b/dosagelib/output.py index 6c01c2845..546db6561 100644 --- a/dosagelib/output.py +++ b/dosagelib/output.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import codecs import contextlib import io diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 1e7ded354..4711faa80 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape, MULTILINE from ..util import tagre diff --git a/dosagelib/plugins/arcamax.py b/dosagelib/plugins/arcamax.py index a1c0b1659..1bde84a14 100644 --- a/dosagelib/plugins/arcamax.py +++ b/dosagelib/plugins/arcamax.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py index c9e6d1084..201f4dca1 100644 --- a/dosagelib/plugins/b.py +++ b/dosagelib/plugins/b.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..util import tagre diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index b9bf678a3..bcf91a751 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/clonemanga.py b/dosagelib/plugins/clonemanga.py index 8cafa57e2..d955e9a19 100644 --- a/dosagelib/plugins/clonemanga.py +++ b/dosagelib/plugins/clonemanga.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..helpers import indirectStarter, xpath_class from ..scraper import _ParserScraper from ..util import getQueryParams diff --git a/dosagelib/plugins/comicfury.py b/dosagelib/plugins/comicfury.py index 485a51703..905594124 100644 --- a/dosagelib/plugins/comicfury.py +++ b/dosagelib/plugins/comicfury.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import os from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/comicgenesis.py b/dosagelib/plugins/comicgenesis.py index 41d2cdd7e..6334dcd09 100644 --- a/dosagelib/plugins/comicgenesis.py +++ b/dosagelib/plugins/comicgenesis.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper # Comicgenesis has a lot of comics, but most of them are disallowed by diff --git a/dosagelib/plugins/comicsherpa.py b/dosagelib/plugins/comicsherpa.py index bf4d6b435..e0709fb52 100644 --- a/dosagelib/plugins/comicsherpa.py +++ b/dosagelib/plugins/comicsherpa.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/comicskingdom.py b/dosagelib/plugins/comicskingdom.py index 09cd12791..16deb0042 100644 --- a/dosagelib/plugins/comicskingdom.py +++ b/dosagelib/plugins/comicskingdom.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher # Copyright (C) 2019 Thomas W. Littauer - -from __future__ import absolute_import, division, print_function - from ..scraper import _BasicScraper from ..helpers import bounceStarter, joinPathPartsNamer diff --git a/dosagelib/plugins/common.py b/dosagelib/plugins/common.py index 6e7c246e3..f1b286234 100644 --- a/dosagelib/plugins/common.py +++ b/dosagelib/plugins/common.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import indirectStarter, xpath_class diff --git a/dosagelib/plugins/creators.py b/dosagelib/plugins/creators.py index 8b8cf317d..12524026d 100644 --- a/dosagelib/plugins/creators.py +++ b/dosagelib/plugins/creators.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import indirectStarter diff --git a/dosagelib/plugins/cyantian.py b/dosagelib/plugins/cyantian.py index 255818035..6e871d63f 100644 --- a/dosagelib/plugins/cyantian.py +++ b/dosagelib/plugins/cyantian.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index 10a78991d..b1883955f 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/derideal.py b/dosagelib/plugins/derideal.py index 524aa8ba4..523e5e132 100644 --- a/dosagelib/plugins/derideal.py +++ b/dosagelib/plugins/derideal.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import indirectStarter diff --git a/dosagelib/plugins/dmfa.py b/dosagelib/plugins/dmfa.py index 89fa5f74e..b5ff58283 100644 --- a/dosagelib/plugins/dmfa.py +++ b/dosagelib/plugins/dmfa.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..helpers import bounceStarter from .common import _ParserScraper diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index 31752c1ba..e0294fc91 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import os from re import compile, IGNORECASE diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 708ab8439..ca9a372c9 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -3,8 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function from re import compile, escape from ..util import tagre diff --git a/dosagelib/plugins/footloosecomic.py b/dosagelib/plugins/footloosecomic.py index d252f1975..e87120731 100644 --- a/dosagelib/plugins/footloosecomic.py +++ b/dosagelib/plugins/footloosecomic.py @@ -2,8 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index 476e15a93..23e9ad559 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/gocomics.py b/dosagelib/plugins/gocomics.py index 6dbdd9870..0d7659dbe 100644 --- a/dosagelib/plugins/gocomics.py +++ b/dosagelib/plugins/gocomics.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import indirectStarter, xpath_class diff --git a/dosagelib/plugins/h.py b/dosagelib/plugins/h.py index 2436a9c60..5a493b77f 100644 --- a/dosagelib/plugins/h.py +++ b/dosagelib/plugins/h.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py index 82daa637b..82bd1887b 100644 --- a/dosagelib/plugins/i.py +++ b/dosagelib/plugins/i.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py index 1342d5c5e..d014146f5 100644 --- a/dosagelib/plugins/j.py +++ b/dosagelib/plugins/j.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py index 898ad27ef..f329b9a0c 100644 --- a/dosagelib/plugins/k.py +++ b/dosagelib/plugins/k.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape, IGNORECASE from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/keenspot.py b/dosagelib/plugins/keenspot.py index e2d8d4183..d3afe168e 100644 --- a/dosagelib/plugins/keenspot.py +++ b/dosagelib/plugins/keenspot.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/kemonocafe.py b/dosagelib/plugins/kemonocafe.py index 542389fd6..2b97e8013 100644 --- a/dosagelib/plugins/kemonocafe.py +++ b/dosagelib/plugins/kemonocafe.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/l.py b/dosagelib/plugins/l.py index bd3ecb87f..cd60f25ce 100644 --- a/dosagelib/plugins/l.py +++ b/dosagelib/plugins/l.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py old mode 100755 new mode 100644 index 1a7f295f5..557c0f906 --- a/dosagelib/plugins/m.py +++ b/dosagelib/plugins/m.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import json from re import compile, escape, IGNORECASE diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py index 5267b93e0..8f89b13a8 100644 --- a/dosagelib/plugins/n.py +++ b/dosagelib/plugins/n.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/namirdeiter.py b/dosagelib/plugins/namirdeiter.py index 8b711f57d..94bf008cb 100644 --- a/dosagelib/plugins/namirdeiter.py +++ b/dosagelib/plugins/namirdeiter.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _ParserScraper diff --git a/dosagelib/plugins/nitrocosm.py b/dosagelib/plugins/nitrocosm.py index 0b3a4a389..f65e64ff9 100644 --- a/dosagelib/plugins/nitrocosm.py +++ b/dosagelib/plugins/nitrocosm.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/nuklearpower.py b/dosagelib/plugins/nuklearpower.py index 7b677197d..74a90d614 100644 --- a/dosagelib/plugins/nuklearpower.py +++ b/dosagelib/plugins/nuklearpower.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/num.py b/dosagelib/plugins/num.py index e41b5143c..e2e2870bc 100644 --- a/dosagelib/plugins/num.py +++ b/dosagelib/plugins/num.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index ea8bfc17e..664186f35 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..helpers import bounceStarter, indirectStarter diff --git a/dosagelib/plugins/old.py b/dosagelib/plugins/old.py index 715ef27c1..bc61bc299 100644 --- a/dosagelib/plugins/old.py +++ b/dosagelib/plugins/old.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import Scraper diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py index 3e382d387..b55c46ffe 100644 --- a/dosagelib/plugins/p.py +++ b/dosagelib/plugins/p.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/petitesymphony.py b/dosagelib/plugins/petitesymphony.py index df07cb7d0..6d24c443e 100644 --- a/dosagelib/plugins/petitesymphony.py +++ b/dosagelib/plugins/petitesymphony.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper, _WPNavi diff --git a/dosagelib/plugins/projectfuture.py b/dosagelib/plugins/projectfuture.py index e91ec359e..f04ea5f69 100644 --- a/dosagelib/plugins/projectfuture.py +++ b/dosagelib/plugins/projectfuture.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _ParserScraper diff --git a/dosagelib/plugins/q.py b/dosagelib/plugins/q.py index 37c5e8417..411895d5e 100644 --- a/dosagelib/plugins/q.py +++ b/dosagelib/plugins/q.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import xpath_class diff --git a/dosagelib/plugins/r.py b/dosagelib/plugins/r.py index bd274ce24..43219a08d 100644 --- a/dosagelib/plugins/r.py +++ b/dosagelib/plugins/r.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile from urllib.parse import urljoin diff --git a/dosagelib/plugins/rhjunior.py b/dosagelib/plugins/rhjunior.py index 7401052c7..fe25adb8c 100644 --- a/dosagelib/plugins/rhjunior.py +++ b/dosagelib/plugins/rhjunior.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index 573e4f0af..b81878ea0 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape, IGNORECASE, sub from os.path import splitext diff --git a/dosagelib/plugins/sandraandwoo.py b/dosagelib/plugins/sandraandwoo.py index fb06ed0d3..5ddcc599c 100644 --- a/dosagelib/plugins/sandraandwoo.py +++ b/dosagelib/plugins/sandraandwoo.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper diff --git a/dosagelib/plugins/smackjeeves.py b/dosagelib/plugins/smackjeeves.py index 8a33403f0..cd4b28648 100644 --- a/dosagelib/plugins/smackjeeves.py +++ b/dosagelib/plugins/smackjeeves.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import re from ..helpers import xpath_class diff --git a/dosagelib/plugins/snafu.py b/dosagelib/plugins/snafu.py index ecdd35f9a..10c9ff1a3 100644 --- a/dosagelib/plugins/snafu.py +++ b/dosagelib/plugins/snafu.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import indirectStarter diff --git a/dosagelib/plugins/studiokhimera.py b/dosagelib/plugins/studiokhimera.py index c32cec8bc..f6af81950 100644 --- a/dosagelib/plugins/studiokhimera.py +++ b/dosagelib/plugins/studiokhimera.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py index bc700e082..214e889d1 100644 --- a/dosagelib/plugins/t.py +++ b/dosagelib/plugins/t.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape, MULTILINE try: from functools import cached_property diff --git a/dosagelib/plugins/u.py b/dosagelib/plugins/u.py index a13887682..a9e99828b 100644 --- a/dosagelib/plugins/u.py +++ b/dosagelib/plugins/u.py @@ -3,10 +3,7 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - -from re import compile, escape +from re import compile from ..scraper import _BasicScraper, _ParserScraper from ..helpers import indirectStarter, xpath_class diff --git a/dosagelib/plugins/v.py b/dosagelib/plugins/v.py index e5a9bf1a7..bb11d0ce4 100644 --- a/dosagelib/plugins/v.py +++ b/dosagelib/plugins/v.py @@ -3,8 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function from re import compile from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/w.py b/dosagelib/plugins/w.py index b196807b3..dbd30f6e3 100644 --- a/dosagelib/plugins/w.py +++ b/dosagelib/plugins/w.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from re import compile, escape, IGNORECASE from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/plugins/webcomicfactory.py b/dosagelib/plugins/webcomicfactory.py index 1d485b93b..98348edf5 100644 --- a/dosagelib/plugins/webcomicfactory.py +++ b/dosagelib/plugins/webcomicfactory.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper from ..helpers import indirectStarter diff --git a/dosagelib/plugins/webtoons.py b/dosagelib/plugins/webtoons.py index 68cf4fc91..35556c944 100644 --- a/dosagelib/plugins/webtoons.py +++ b/dosagelib/plugins/webtoons.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/wlpcomics.py b/dosagelib/plugins/wlpcomics.py index d35edae0a..3624fee70 100644 --- a/dosagelib/plugins/wlpcomics.py +++ b/dosagelib/plugins/wlpcomics.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - import re from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/wumo.py b/dosagelib/plugins/wumo.py index 48165947d..28279c63f 100644 --- a/dosagelib/plugins/wumo.py +++ b/dosagelib/plugins/wumo.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/x.py b/dosagelib/plugins/x.py index 41130f891..40738887a 100644 --- a/dosagelib/plugins/x.py +++ b/dosagelib/plugins/x.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from ..scraper import _ParserScraper from ..helpers import bounceStarter diff --git a/dosagelib/plugins/y.py b/dosagelib/plugins/y.py index cdc68b321..6481f2185 100644 --- a/dosagelib/plugins/y.py +++ b/dosagelib/plugins/y.py @@ -3,9 +3,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring - -from __future__ import absolute_import, division, print_function - from .common import _WordPressScraper, _WPWebcomic diff --git a/dosagelib/plugins/z.py b/dosagelib/plugins/z.py index e01906175..693dfc7fe 100644 --- a/dosagelib/plugins/z.py +++ b/dosagelib/plugins/z.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from re import compile, escape from ..scraper import _BasicScraper, _ParserScraper diff --git a/dosagelib/rss.py b/dosagelib/rss.py index 6d4897fc5..e0965654f 100644 --- a/dosagelib/rss.py +++ b/dosagelib/rss.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2015-2017 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import xml.dom.minidom import time from .configuration import App diff --git a/dosagelib/scraper.py b/dosagelib/scraper.py index c2a9e7528..024ee5193 100644 --- a/dosagelib/scraper.py +++ b/dosagelib/scraper.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import os import re from urllib.parse import urljoin diff --git a/dosagelib/singleton.py b/dosagelib/singleton.py index d4ab6ae32..d169ec997 100644 --- a/dosagelib/singleton.py +++ b/dosagelib/singleton.py @@ -3,9 +3,6 @@ # License: PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 # Author: Sorin Sbarnea # Changes: changed logging and formatting - -from __future__ import absolute_import, division, print_function - import sys import os import errno diff --git a/dosagelib/updater.py b/dosagelib/updater.py index 657b6ce52..c2ddf0cce 100644 --- a/dosagelib/updater.py +++ b/dosagelib/updater.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import os from distutils.version import LooseVersion diff --git a/dosagelib/util.py b/dosagelib/util.py index 525e71389..d1ef3fd9b 100644 --- a/dosagelib/util.py +++ b/dosagelib/util.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import html import os import re diff --git a/scripts/arcamax.py b/scripts/arcamax.py index f87520abf..21ae8e90b 100755 --- a/scripts/arcamax.py +++ b/scripts/arcamax.py @@ -7,7 +7,6 @@ Script to get arcamax comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from scriptutil import ComicListUpdater diff --git a/scripts/comicfury.py b/scripts/comicfury.py index c436e55fa..a27442ffb 100755 --- a/scripts/comicfury.py +++ b/scripts/comicfury.py @@ -7,7 +7,6 @@ Script to get ComicFury comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function import sys from urllib.parse import urlsplit diff --git a/scripts/comicsherpa.py b/scripts/comicsherpa.py index 1c0134e6d..23825e4d1 100755 --- a/scripts/comicsherpa.py +++ b/scripts/comicsherpa.py @@ -7,7 +7,6 @@ Script to get a list of ComicSherpa and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from scriptutil import ComicListUpdater diff --git a/scripts/comicskingdom.py b/scripts/comicskingdom.py index 3e1cd8390..cadbb6080 100755 --- a/scripts/comicskingdom.py +++ b/scripts/comicskingdom.py @@ -6,7 +6,6 @@ Script to get a list of comicskingdom.com comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from scriptutil import ComicListUpdater diff --git a/scripts/create-cbz.py b/scripts/create-cbz.py index d52f4012b..e2ddfe705 100755 --- a/scripts/create-cbz.py +++ b/scripts/create-cbz.py @@ -8,7 +8,6 @@ Creates a CBZ file in the comic directory. Uses an ordered symlink directory (see order-symlinks.py) if it exists, else the plain files are used. """ -from __future__ import absolute_import, division, print_function import sys import os diff --git a/scripts/creators.py b/scripts/creators.py index cbc889c05..1ae9ddcae 100755 --- a/scripts/creators.py +++ b/scripts/creators.py @@ -6,7 +6,6 @@ Script to get a list of creators.com comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from scriptutil import ComicListUpdater diff --git a/scripts/gocomics.py b/scripts/gocomics.py index 4f6431952..e391fac1a 100755 --- a/scripts/gocomics.py +++ b/scripts/gocomics.py @@ -7,7 +7,6 @@ Script to get a list of gocomics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from scriptutil import ComicListUpdater diff --git a/scripts/hook-dosagelib.py b/scripts/hook-dosagelib.py index f99345ddf..d3beb1b5d 100644 --- a/scripts/hook-dosagelib.py +++ b/scripts/hook-dosagelib.py @@ -2,8 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2017 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function from PyInstaller.utils.hooks import collect_submodules, copy_metadata hiddenimports = collect_submodules('dosagelib.plugins') diff --git a/scripts/keenspot.py b/scripts/keenspot.py index e4826b13e..c72438b0e 100755 --- a/scripts/keenspot.py +++ b/scripts/keenspot.py @@ -8,7 +8,6 @@ Script to get a list of KeenSpot comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function from urllib.parse import urlsplit diff --git a/scripts/mklanguages.py b/scripts/mklanguages.py index ab707c058..d51d5a720 100755 --- a/scripts/mklanguages.py +++ b/scripts/mklanguages.py @@ -4,8 +4,6 @@ # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2018 Tobias Gruetzmacher '''update languages.py from pycountry''' -from __future__ import absolute_import, division, print_function - import os import sys import codecs @@ -24,7 +22,6 @@ def main(): f.write('# -*- coding: %s -*-%s' % (encoding, os.linesep)) f.write('# ISO 693-1 language codes from pycountry%s' % os.linesep) f.write('# This file is automatically generated, DO NOT EDIT!%s' % os.linesep) - f.write('from __future__ import absolute_import, division, print_function%s' % os.linesep) lang = get_used_languages() write_languages(f, lang) diff --git a/scripts/order-symlinks.py b/scripts/order-symlinks.py index 0266fb60d..53fc23783 100755 --- a/scripts/order-symlinks.py +++ b/scripts/order-symlinks.py @@ -8,8 +8,6 @@ This script takes the JSON file created by 'dosage -o json' and uses the metadata to build a symlink farm in the deduced order of the comic. It created those in a subdirectory called 'inorder'. """ -from __future__ import absolute_import, division, print_function - import sys import os import codecs diff --git a/scripts/scriptutil.py b/scripts/scriptutil.py index 8cf07748f..d261f8837 100644 --- a/scripts/scriptutil.py +++ b/scripts/scriptutil.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import codecs import json import os diff --git a/scripts/webcomicfactory.py b/scripts/webcomicfactory.py index daa0a2403..e96dbac5c 100755 --- a/scripts/webcomicfactory.py +++ b/scripts/webcomicfactory.py @@ -7,8 +7,6 @@ Script to get WebComicFactory comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function - from scriptutil import ComicListUpdater diff --git a/scripts/webtoons.py b/scripts/webtoons.py index 9bff6f0d4..3fcaf4bf4 100644 --- a/scripts/webtoons.py +++ b/scripts/webtoons.py @@ -6,8 +6,6 @@ Script to get a list of WebToons comics and save the info in a JSON file for further processing. """ -from __future__ import absolute_import, division, print_function - from urllib.parse import urlsplit, parse_qs from scriptutil import ComicListUpdater diff --git a/setup.py b/setup.py index 7739e7dc2..79d377f05 100644 --- a/setup.py +++ b/setup.py @@ -3,9 +3,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from setuptools import setup setup( diff --git a/tests/conftest.py b/tests/conftest.py index 41ff88e7b..1384cc5f5 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import time import pytest diff --git a/tests/httpmocks.py b/tests/httpmocks.py index 3e8d0bcd0..0a8526c00 100644 --- a/tests/httpmocks.py +++ b/tests/httpmocks.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2017-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import gzip import os.path import re diff --git a/tests/modules/check_comics.py b/tests/modules/check_comics.py index e0bb9da6b..b491054ef 100644 --- a/tests/modules/check_comics.py +++ b/tests/modules/check_comics.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import re import multiprocessing from urllib.parse import urlsplit diff --git a/tests/modules/conftest.py b/tests/modules/conftest.py index 8e4ff7d40..53caef723 100644 --- a/tests/modules/conftest.py +++ b/tests/modules/conftest.py @@ -2,11 +2,7 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import re -import operator import os import pytest diff --git a/tests/test_comicnames.py b/tests/test_comicnames.py index e38a0c919..0491fc098 100644 --- a/tests/test_comicnames.py +++ b/tests/test_comicnames.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import re from dosagelib import scraper diff --git a/tests/test_dosage.py b/tests/test_dosage.py index 44ab11677..0504ef026 100644 --- a/tests/test_dosage.py +++ b/tests/test_dosage.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import json import os import re diff --git a/tests/test_helpers.py b/tests/test_helpers.py index 196032e17..fbe2b12d6 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - from dosagelib.helpers import joinPathPartsNamer, queryNamer diff --git a/tests/test_modules.py b/tests/test_modules.py index 4cadf8ed7..9dc2a0b58 100644 --- a/tests/test_modules.py +++ b/tests/test_modules.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import re import pytest diff --git a/tests/test_rss.py b/tests/test_rss.py index d897af7d2..10e3647af 100644 --- a/tests/test_rss.py +++ b/tests/test_rss.py @@ -1,8 +1,5 @@ # -*- coding: utf-8 -*- # Copyright (C) 2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import time from dosagelib.rss import parseFeed diff --git a/tests/test_scraper.py b/tests/test_scraper.py index 0dd7d4a32..fb7b5a90a 100644 --- a/tests/test_scraper.py +++ b/tests/test_scraper.py @@ -1,9 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (C) 2013-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import pytest from dosagelib import scraper diff --git a/tests/test_singletoninstance.py b/tests/test_singletoninstance.py index 0544a6ee5..5e99fff5b 100644 --- a/tests/test_singletoninstance.py +++ b/tests/test_singletoninstance.py @@ -3,9 +3,6 @@ # License: PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 # Author: Sorin Sbarnea # Changes: changed logging and formatting - -from __future__ import absolute_import, division, print_function - from dosagelib import singleton from multiprocessing import Process diff --git a/tests/test_util.py b/tests/test_util.py index 6af0dbd09..78f4a3a86 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2018 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import pytest import re from dosagelib.util import normaliseURL, unescape, tagre, get_system_uid diff --git a/tests/test_vote.py b/tests/test_vote.py index de3856cdc..c2bef1731 100644 --- a/tests/test_vote.py +++ b/tests/test_vote.py @@ -2,9 +2,6 @@ # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher - -from __future__ import absolute_import, division, print_function - import responses from dosagelib import scraper