From 27d28b8eef9506e06dac0ef957e07f1bca0c9625 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sat, 18 Apr 2020 13:45:44 +0200 Subject: [PATCH] Update file headers The default encoding for source files is UTF-8 since Python 3, so we can drop all encoding headers. While we are at it, just replace them with SPDX headers. --- .staticsite.py | 2 +- README.md | 5 ++++- dosage | 2 +- dosagelib/__init__.py | 2 +- dosagelib/cmd.py | 2 +- dosagelib/comic.py | 2 +- dosagelib/configuration.py | 2 +- dosagelib/director.py | 2 +- dosagelib/events.py | 2 +- dosagelib/helpers.py | 2 +- dosagelib/http.py | 2 +- dosagelib/languages.py | 2 +- dosagelib/loader.py | 2 +- dosagelib/output.py | 2 +- dosagelib/plugins/a.py | 2 +- dosagelib/plugins/arcamax.py | 2 +- dosagelib/plugins/b.py | 2 +- dosagelib/plugins/c.py | 2 +- dosagelib/plugins/clonemanga.py | 2 +- dosagelib/plugins/comicfury.py | 2 +- dosagelib/plugins/comicgenesis.py | 2 +- dosagelib/plugins/comicsherpa.py | 2 +- dosagelib/plugins/comicskingdom.py | 2 +- dosagelib/plugins/common.py | 2 +- dosagelib/plugins/creators.py | 2 +- dosagelib/plugins/cyantian.py | 2 +- dosagelib/plugins/d.py | 2 +- dosagelib/plugins/derideal.py | 2 +- dosagelib/plugins/dmfa.py | 2 +- dosagelib/plugins/e.py | 2 +- dosagelib/plugins/f.py | 2 +- dosagelib/plugins/footloosecomic.py | 2 +- dosagelib/plugins/g.py | 2 +- dosagelib/plugins/gocomics.py | 2 +- dosagelib/plugins/h.py | 2 +- dosagelib/plugins/i.py | 2 +- dosagelib/plugins/j.py | 2 +- dosagelib/plugins/k.py | 2 +- dosagelib/plugins/keenspot.py | 2 +- dosagelib/plugins/kemonocafe.py | 2 +- dosagelib/plugins/l.py | 2 +- dosagelib/plugins/m.py | 2 +- dosagelib/plugins/mangadex.py | 2 +- dosagelib/plugins/n.py | 2 +- dosagelib/plugins/namirdeiter.py | 2 +- dosagelib/plugins/nitrocosm.py | 2 +- dosagelib/plugins/nuklearpower.py | 2 +- dosagelib/plugins/num.py | 2 +- dosagelib/plugins/o.py | 2 +- dosagelib/plugins/old.py | 2 +- dosagelib/plugins/p.py | 2 +- dosagelib/plugins/petitesymphony.py | 2 +- dosagelib/plugins/projectfuture.py | 2 +- dosagelib/plugins/q.py | 2 +- dosagelib/plugins/r.py | 2 +- dosagelib/plugins/rhjunior.py | 2 +- dosagelib/plugins/s.py | 2 +- dosagelib/plugins/sandraandwoo.py | 2 +- dosagelib/plugins/smackjeeves.py | 2 +- dosagelib/plugins/snafu.py | 2 +- dosagelib/plugins/studiokhimera.py | 2 +- dosagelib/plugins/t.py | 2 +- dosagelib/plugins/u.py | 2 +- dosagelib/plugins/v.py | 2 +- dosagelib/plugins/w.py | 2 +- dosagelib/plugins/webcomicfactory.py | 2 +- dosagelib/plugins/webtoons.py | 2 +- dosagelib/plugins/wlpcomics.py | 2 +- dosagelib/plugins/wumo.py | 2 +- dosagelib/plugins/x.py | 2 +- dosagelib/plugins/y.py | 2 +- dosagelib/plugins/z.py | 2 +- dosagelib/rss.py | 2 +- dosagelib/scraper.py | 2 +- dosagelib/singleton.py | 2 +- dosagelib/updater.py | 2 +- dosagelib/util.py | 2 +- scripts/arcamax.py | 4 ++-- scripts/comicfury.py | 4 ++-- scripts/comicsherpa.py | 4 ++-- scripts/comicskingdom.py | 4 ++-- scripts/create-cbz.py | 4 ++-- scripts/creators.py | 4 ++-- scripts/gocomics.py | 4 ++-- scripts/hook-dosagelib.py | 2 +- scripts/keenspot.py | 4 ++-- scripts/mklanguages.py | 11 +++++------ scripts/order-symlinks.py | 4 ++-- scripts/scriptutil.py | 2 +- scripts/webcomicfactory.py | 2 +- scripts/webtoons.py | 2 +- setup.py | 4 ++-- tests/conftest.py | 2 +- tests/httpmocks.py | 2 +- tests/modules/check_comics.py | 2 +- tests/modules/conftest.py | 2 +- tests/test_comicnames.py | 2 +- tests/test_dosage.py | 2 +- tests/test_helpers.py | 2 +- tests/test_modules.py | 2 +- tests/test_rss.py | 2 +- tests/test_scraper.py | 2 +- tests/test_singletoninstance.py | 2 +- tests/test_util.py | 2 +- tests/test_vote.py | 2 +- tox.ini | 1 + 106 files changed, 123 insertions(+), 120 deletions(-) diff --git a/.staticsite.py b/.staticsite.py index 9227f6ece..baa34824b 100644 --- a/.staticsite.py +++ b/.staticsite.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT SITE_NAME = "dosage" SITE_SUB = "a comic downloader and archiver" SITE_AUTHOR = "Tobias Gruetzmacher" diff --git a/README.md b/README.md index c161f75da..9e10c95d8 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ [![Build Status](https://travis-ci.com/webcomics/dosage.svg?branch=master)](https://travis-ci.com/webcomics/dosage) [![Code Climate](https://codeclimate.com/github/webcomics/dosage/badges/gpa.svg)](https://codeclimate.com/github/webcomics/dosage) [![codecov](https://codecov.io/gh/webcomics/dosage/branch/master/graph/badge.svg)](https://codecov.io/gh/webcomics/dosage) -[![Maintenance](https://img.shields.io/maintenance/yes/2020.svg)]() +![Maintenance](https://img.shields.io/maintenance/yes/2020.svg) +![License](https://img.shields.io/github/license/webcomics/dosage) Dosage is designed to keep a local copy of specific webcomics and other picture-based content such as Picture of the Day sites. With the dosage @@ -14,6 +15,8 @@ the webcomic's site layout allows this). Multiple webcomics can be downloaded in parallel, making the update of comic strips faster. +Dosage is licensed under the [MIT license](COPYING) + ## Notice This software is in no way intended to publically "broadcast" comic strips, it diff --git a/dosage b/dosage index 95f1092f5..e95f028f5 100755 --- a/dosage +++ b/dosage @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2018 Tobias Gruetzmacher diff --git a/dosagelib/__init__.py b/dosagelib/__init__.py index e58ab4680..4f80013df 100644 --- a/dosagelib/__init__.py +++ b/dosagelib/__init__.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/dosagelib/cmd.py b/dosagelib/cmd.py index 4b741e80d..4db38bb93 100644 --- a/dosagelib/cmd.py +++ b/dosagelib/cmd.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/dosagelib/comic.py b/dosagelib/comic.py index 201e0a98c..20374c126 100644 --- a/dosagelib/comic.py +++ b/dosagelib/comic.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/configuration.py b/dosagelib/configuration.py index ff05b1b56..6a01f5e3c 100644 --- a/dosagelib/configuration.py +++ b/dosagelib/configuration.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring diff --git a/dosagelib/director.py b/dosagelib/director.py index b678b5289..bb2479e96 100644 --- a/dosagelib/director.py +++ b/dosagelib/director.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/events.py b/dosagelib/events.py index 87859e7bb..48ae53a48 100644 --- a/dosagelib/events.py +++ b/dosagelib/events.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/helpers.py b/dosagelib/helpers.py index cee457f89..7d587cf17 100644 --- a/dosagelib/helpers.py +++ b/dosagelib/helpers.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/http.py b/dosagelib/http.py index e8a6b56b6..1ece66ff5 100644 --- a/dosagelib/http.py +++ b/dosagelib/http.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher import collections import random diff --git a/dosagelib/languages.py b/dosagelib/languages.py index c1295dddc..fd19edac2 100644 --- a/dosagelib/languages.py +++ b/dosagelib/languages.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # ISO 693-1 language codes from pycountry # This file is automatically generated, DO NOT EDIT! Languages = { diff --git a/dosagelib/loader.py b/dosagelib/loader.py index 79a3d934e..bc7c6057d 100644 --- a/dosagelib/loader.py +++ b/dosagelib/loader.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2016-2019 Tobias Gruetzmacher """ diff --git a/dosagelib/output.py b/dosagelib/output.py index 546db6561..ab1b25d66 100644 --- a/dosagelib/output.py +++ b/dosagelib/output.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 4711faa80..741356b4c 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/arcamax.py b/dosagelib/plugins/arcamax.py index 1bde84a14..170fc14b4 100644 --- a/dosagelib/plugins/arcamax.py +++ b/dosagelib/plugins/arcamax.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py index e765ddf95..a0667d77d 100644 --- a/dosagelib/plugins/b.py +++ b/dosagelib/plugins/b.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index bcf91a751..5506e1979 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/clonemanga.py b/dosagelib/plugins/clonemanga.py index d955e9a19..5cc342d3f 100644 --- a/dosagelib/plugins/clonemanga.py +++ b/dosagelib/plugins/clonemanga.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/dosagelib/plugins/comicfury.py b/dosagelib/plugins/comicfury.py index e3257d22f..1ea7d86c7 100644 --- a/dosagelib/plugins/comicfury.py +++ b/dosagelib/plugins/comicfury.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/comicgenesis.py b/dosagelib/plugins/comicgenesis.py index 6334dcd09..59c35eb75 100644 --- a/dosagelib/plugins/comicgenesis.py +++ b/dosagelib/plugins/comicgenesis.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/comicsherpa.py b/dosagelib/plugins/comicsherpa.py index e0709fb52..152f8f3de 100644 --- a/dosagelib/plugins/comicsherpa.py +++ b/dosagelib/plugins/comicsherpa.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/comicskingdom.py b/dosagelib/plugins/comicskingdom.py index 16deb0042..6795b3178 100644 --- a/dosagelib/plugins/comicskingdom.py +++ b/dosagelib/plugins/comicskingdom.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019 Tobias Gruetzmacher # Copyright (C) 2019 Thomas W. Littauer from ..scraper import _BasicScraper diff --git a/dosagelib/plugins/common.py b/dosagelib/plugins/common.py index f1b286234..0bcc2f68e 100644 --- a/dosagelib/plugins/common.py +++ b/dosagelib/plugins/common.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/creators.py b/dosagelib/plugins/creators.py index 12524026d..bc202cf0a 100644 --- a/dosagelib/plugins/creators.py +++ b/dosagelib/plugins/creators.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/cyantian.py b/dosagelib/plugins/cyantian.py index 6e871d63f..a7eedc391 100644 --- a/dosagelib/plugins/cyantian.py +++ b/dosagelib/plugins/cyantian.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from .common import _WordPressScraper diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index b1883955f..07429f3ae 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/derideal.py b/dosagelib/plugins/derideal.py index 523e5e132..bcb33dd64 100644 --- a/dosagelib/plugins/derideal.py +++ b/dosagelib/plugins/derideal.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/dmfa.py b/dosagelib/plugins/dmfa.py index b5ff58283..368861f5e 100644 --- a/dosagelib/plugins/dmfa.py +++ b/dosagelib/plugins/dmfa.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..helpers import bounceStarter diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index 567e7c347..75984320f 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index b8de5cbc8..c9dc28d15 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/footloosecomic.py b/dosagelib/plugins/footloosecomic.py index e87120731..230cb38c6 100644 --- a/dosagelib/plugins/footloosecomic.py +++ b/dosagelib/plugins/footloosecomic.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index ff39b7ede..6b38ce516 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/gocomics.py b/dosagelib/plugins/gocomics.py index 86a7de793..8cdc6f33f 100644 --- a/dosagelib/plugins/gocomics.py +++ b/dosagelib/plugins/gocomics.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/h.py b/dosagelib/plugins/h.py index 5a493b77f..73672270a 100644 --- a/dosagelib/plugins/h.py +++ b/dosagelib/plugins/h.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py index eedf78e55..c5493a1cf 100644 --- a/dosagelib/plugins/i.py +++ b/dosagelib/plugins/i.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py index d014146f5..5689be77a 100644 --- a/dosagelib/plugins/j.py +++ b/dosagelib/plugins/j.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py index f329b9a0c..5919ca8b0 100644 --- a/dosagelib/plugins/k.py +++ b/dosagelib/plugins/k.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/keenspot.py b/dosagelib/plugins/keenspot.py index d3afe168e..c5c1d5a5d 100644 --- a/dosagelib/plugins/keenspot.py +++ b/dosagelib/plugins/keenspot.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/kemonocafe.py b/dosagelib/plugins/kemonocafe.py index 2b97e8013..a8e5353d6 100644 --- a/dosagelib/plugins/kemonocafe.py +++ b/dosagelib/plugins/kemonocafe.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/l.py b/dosagelib/plugins/l.py index 39c4e1cae..b82de963a 100644 --- a/dosagelib/plugins/l.py +++ b/dosagelib/plugins/l.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py index 557c0f906..5ca724ce1 100644 --- a/dosagelib/plugins/m.py +++ b/dosagelib/plugins/m.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/mangadex.py b/dosagelib/plugins/mangadex.py index 341df3d58..491f16839 100644 --- a/dosagelib/plugins/mangadex.py +++ b/dosagelib/plugins/mangadex.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring import json diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py index 7b154ced1..b12832698 100644 --- a/dosagelib/plugins/n.py +++ b/dosagelib/plugins/n.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/namirdeiter.py b/dosagelib/plugins/namirdeiter.py index 94bf008cb..d87698b8c 100644 --- a/dosagelib/plugins/namirdeiter.py +++ b/dosagelib/plugins/namirdeiter.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from .common import _ParserScraper diff --git a/dosagelib/plugins/nitrocosm.py b/dosagelib/plugins/nitrocosm.py index f65e64ff9..d9c1a6d61 100644 --- a/dosagelib/plugins/nitrocosm.py +++ b/dosagelib/plugins/nitrocosm.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/nuklearpower.py b/dosagelib/plugins/nuklearpower.py index 74a90d614..887e1e9d5 100644 --- a/dosagelib/plugins/nuklearpower.py +++ b/dosagelib/plugins/nuklearpower.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/num.py b/dosagelib/plugins/num.py index e2e2870bc..edea61443 100644 --- a/dosagelib/plugins/num.py +++ b/dosagelib/plugins/num.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index 5d16e5adb..ee4ba72ff 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/old.py b/dosagelib/plugins/old.py index 4e8506a08..070146ac4 100644 --- a/dosagelib/plugins/old.py +++ b/dosagelib/plugins/old.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py index b55c46ffe..d78ee15e3 100644 --- a/dosagelib/plugins/p.py +++ b/dosagelib/plugins/p.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/petitesymphony.py b/dosagelib/plugins/petitesymphony.py index 6d24c443e..21b15912e 100644 --- a/dosagelib/plugins/petitesymphony.py +++ b/dosagelib/plugins/petitesymphony.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/projectfuture.py b/dosagelib/plugins/projectfuture.py index f04ea5f69..a5223e644 100644 --- a/dosagelib/plugins/projectfuture.py +++ b/dosagelib/plugins/projectfuture.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from .common import _ParserScraper diff --git a/dosagelib/plugins/q.py b/dosagelib/plugins/q.py index 411895d5e..4eed75a29 100644 --- a/dosagelib/plugins/q.py +++ b/dosagelib/plugins/q.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/r.py b/dosagelib/plugins/r.py index 43219a08d..f29e4bc35 100644 --- a/dosagelib/plugins/r.py +++ b/dosagelib/plugins/r.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/rhjunior.py b/dosagelib/plugins/rhjunior.py index fe25adb8c..2de2e0751 100644 --- a/dosagelib/plugins/rhjunior.py +++ b/dosagelib/plugins/rhjunior.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index 1b1d66994..f189e939a 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/sandraandwoo.py b/dosagelib/plugins/sandraandwoo.py index 5ddcc599c..fbfc140f6 100644 --- a/dosagelib/plugins/sandraandwoo.py +++ b/dosagelib/plugins/sandraandwoo.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/smackjeeves.py b/dosagelib/plugins/smackjeeves.py index 611f9b5f0..814160295 100644 --- a/dosagelib/plugins/smackjeeves.py +++ b/dosagelib/plugins/smackjeeves.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2015-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring import re diff --git a/dosagelib/plugins/snafu.py b/dosagelib/plugins/snafu.py index 10c9ff1a3..7d6ee50d2 100644 --- a/dosagelib/plugins/snafu.py +++ b/dosagelib/plugins/snafu.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/studiokhimera.py b/dosagelib/plugins/studiokhimera.py index f6af81950..62015cf71 100644 --- a/dosagelib/plugins/studiokhimera.py +++ b/dosagelib/plugins/studiokhimera.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py index 1f6ebc815..887d5562a 100644 --- a/dosagelib/plugins/t.py +++ b/dosagelib/plugins/t.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/u.py b/dosagelib/plugins/u.py index 8f3ca5b4a..d0a5b8ad3 100644 --- a/dosagelib/plugins/u.py +++ b/dosagelib/plugins/u.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/v.py b/dosagelib/plugins/v.py index bb11d0ce4..c83fddc73 100644 --- a/dosagelib/plugins/v.py +++ b/dosagelib/plugins/v.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/w.py b/dosagelib/plugins/w.py index 42e748799..b6d1ce335 100644 --- a/dosagelib/plugins/w.py +++ b/dosagelib/plugins/w.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/webcomicfactory.py b/dosagelib/plugins/webcomicfactory.py index 98348edf5..faaaf35b8 100644 --- a/dosagelib/plugins/webcomicfactory.py +++ b/dosagelib/plugins/webcomicfactory.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/webtoons.py b/dosagelib/plugins/webtoons.py index e35bf2edb..61c902eff 100644 --- a/dosagelib/plugins/webtoons.py +++ b/dosagelib/plugins/webtoons.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring from ..scraper import _ParserScraper diff --git a/dosagelib/plugins/wlpcomics.py b/dosagelib/plugins/wlpcomics.py index 95a1d9822..ae21d8d9f 100644 --- a/dosagelib/plugins/wlpcomics.py +++ b/dosagelib/plugins/wlpcomics.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/wumo.py b/dosagelib/plugins/wumo.py index 28279c63f..accc9783d 100644 --- a/dosagelib/plugins/wumo.py +++ b/dosagelib/plugins/wumo.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/dosagelib/plugins/x.py b/dosagelib/plugins/x.py index d57364cb5..0dcab26ce 100644 --- a/dosagelib/plugins/x.py +++ b/dosagelib/plugins/x.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/y.py b/dosagelib/plugins/y.py index 6481f2185..ecd75a33c 100644 --- a/dosagelib/plugins/y.py +++ b/dosagelib/plugins/y.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/plugins/z.py b/dosagelib/plugins/z.py index 693dfc7fe..456c73e7a 100644 --- a/dosagelib/plugins/z.py +++ b/dosagelib/plugins/z.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/dosagelib/rss.py b/dosagelib/rss.py index e0965654f..e35bd7333 100644 --- a/dosagelib/rss.py +++ b/dosagelib/rss.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2015-2017 Tobias Gruetzmacher import xml.dom.minidom diff --git a/dosagelib/scraper.py b/dosagelib/scraper.py index e89daf6ac..f1ab5376f 100644 --- a/dosagelib/scraper.py +++ b/dosagelib/scraper.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/singleton.py b/dosagelib/singleton.py index d169ec997..7f2cff602 100644 --- a/dosagelib/singleton.py +++ b/dosagelib/singleton.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copied from: https://github.com/pycontribs/tendo # License: PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 # Author: Sorin Sbarnea diff --git a/dosagelib/updater.py b/dosagelib/updater.py index c2ddf0cce..99218489d 100644 --- a/dosagelib/updater.py +++ b/dosagelib/updater.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/dosagelib/util.py b/dosagelib/util.py index 2c8afbdd0..4b1c8680e 100644 --- a/dosagelib/util.py +++ b/dosagelib/util.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/scripts/arcamax.py b/scripts/arcamax.py index 21ae8e90b..cf16f996b 100755 --- a/scripts/arcamax.py +++ b/scripts/arcamax.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/scripts/comicfury.py b/scripts/comicfury.py index a27442ffb..0a7961299 100755 --- a/scripts/comicfury.py +++ b/scripts/comicfury.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/scripts/comicsherpa.py b/scripts/comicsherpa.py index 23825e4d1..8cc465f53 100755 --- a/scripts/comicsherpa.py +++ b/scripts/comicsherpa.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2017 Tobias Gruetzmacher diff --git a/scripts/comicskingdom.py b/scripts/comicskingdom.py index cadbb6080..56706691a 100755 --- a/scripts/comicskingdom.py +++ b/scripts/comicskingdom.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2019 Tobias Gruetzmacher # Copyright (C) 2019 Thomas W. Littauer """ diff --git a/scripts/create-cbz.py b/scripts/create-cbz.py index e2ddfe705..9b015f97a 100755 --- a/scripts/create-cbz.py +++ b/scripts/create-cbz.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/scripts/creators.py b/scripts/creators.py index 1ae9ddcae..540c4c365 100755 --- a/scripts/creators.py +++ b/scripts/creators.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher """ diff --git a/scripts/gocomics.py b/scripts/gocomics.py index e391fac1a..907705049 100755 --- a/scripts/gocomics.py +++ b/scripts/gocomics.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2017 Tobias Gruetzmacher diff --git a/scripts/hook-dosagelib.py b/scripts/hook-dosagelib.py index d3beb1b5d..f597943fb 100644 --- a/scripts/hook-dosagelib.py +++ b/scripts/hook-dosagelib.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2017 Tobias Gruetzmacher diff --git a/scripts/keenspot.py b/scripts/keenspot.py index c72438b0e..dbf6cf5ca 100755 --- a/scripts/keenspot.py +++ b/scripts/keenspot.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/scripts/mklanguages.py b/scripts/mklanguages.py index d51d5a720..331b8f953 100755 --- a/scripts/mklanguages.py +++ b/scripts/mklanguages.py @@ -1,5 +1,5 @@ #!/usr/bin/python3 -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2018 Tobias Gruetzmacher @@ -17,11 +17,10 @@ from dosagelib.scraper import get_scrapers # noqa def main(): """Update language information in dosagelib/languages.py.""" fn = os.path.join(basepath, 'dosagelib', 'languages.py') - encoding = 'utf-8' - with codecs.open(fn, 'w', encoding) as f: - 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) + with codecs.open(fn, 'w', 'utf-8') as f: + f.write('# SPDX-License-Identifier: MIT\n') + f.write('# ISO 693-1 language codes from pycountry\n') + f.write('# This file is automatically generated, DO NOT EDIT!\n') lang = get_used_languages() write_languages(f, lang) diff --git a/scripts/order-symlinks.py b/scripts/order-symlinks.py index 53fc23783..c38511676 100755 --- a/scripts/order-symlinks.py +++ b/scripts/order-symlinks.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/scripts/scriptutil.py b/scripts/scriptutil.py index 034e5dcb3..163ad4e45 100644 --- a/scripts/scriptutil.py +++ b/scripts/scriptutil.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/scripts/webcomicfactory.py b/scripts/webcomicfactory.py index e96dbac5c..a39652aa9 100755 --- a/scripts/webcomicfactory.py +++ b/scripts/webcomicfactory.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher diff --git a/scripts/webtoons.py b/scripts/webtoons.py index 3fcaf4bf4..b7fc535bc 100755 --- a/scripts/webtoons.py +++ b/scripts/webtoons.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher # Copyright (C) 2019-2020 Daniel Ring """ diff --git a/setup.py b/setup.py index 79d377f05..4cd82b87e 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- +#!/usr/bin/env python3 +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/tests/conftest.py b/tests/conftest.py index 156c81613..8349db392 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher import time diff --git a/tests/httpmocks.py b/tests/httpmocks.py index 0a8526c00..3e833b78e 100644 --- a/tests/httpmocks.py +++ b/tests/httpmocks.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2017-2019 Tobias Gruetzmacher import gzip import os.path diff --git a/tests/modules/check_comics.py b/tests/modules/check_comics.py index b491054ef..ba63699e3 100644 --- a/tests/modules/check_comics.py +++ b/tests/modules/check_comics.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/tests/modules/conftest.py b/tests/modules/conftest.py index b32584359..c7af1ef78 100644 --- a/tests/modules/conftest.py +++ b/tests/modules/conftest.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/tests/test_comicnames.py b/tests/test_comicnames.py index 0491fc098..f4ed860a8 100644 --- a/tests/test_comicnames.py +++ b/tests/test_comicnames.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/tests/test_dosage.py b/tests/test_dosage.py index 41e1f02a8..59ce80acb 100644 --- a/tests/test_dosage.py +++ b/tests/test_dosage.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/tests/test_helpers.py b/tests/test_helpers.py index fbe2b12d6..598a74fc4 100644 --- a/tests/test_helpers.py +++ b/tests/test_helpers.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019 Tobias Gruetzmacher from dosagelib.helpers import joinPathPartsNamer, queryNamer diff --git a/tests/test_modules.py b/tests/test_modules.py index 4b0d6c3e0..0fa85f4bb 100644 --- a/tests/test_modules.py +++ b/tests/test_modules.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019-2020 Tobias Gruetzmacher import re diff --git a/tests/test_rss.py b/tests/test_rss.py index 10e3647af..f3e3b6a2e 100644 --- a/tests/test_rss.py +++ b/tests/test_rss.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2019 Tobias Gruetzmacher import time from dosagelib.rss import parseFeed diff --git a/tests/test_scraper.py b/tests/test_scraper.py index 8591ab7b0..06076cddf 100644 --- a/tests/test_scraper.py +++ b/tests/test_scraper.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2013-2014 Bastian Kleineidam # Copyright (C) 2015-2016 Tobias Gruetzmacher import pytest diff --git a/tests/test_singletoninstance.py b/tests/test_singletoninstance.py index 5e99fff5b..4be7da6f5 100644 --- a/tests/test_singletoninstance.py +++ b/tests/test_singletoninstance.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copied from: https://github.com/pycontribs/tendo # License: PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 # Author: Sorin Sbarnea diff --git a/tests/test_util.py b/tests/test_util.py index b69aa33de..a520def7b 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2020 Tobias Gruetzmacher diff --git a/tests/test_vote.py b/tests/test_vote.py index c2bef1731..57e11ac98 100644 --- a/tests/test_vote.py +++ b/tests/test_vote.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# SPDX-License-Identifier: MIT # Copyright (C) 2004-2008 Tristan Seligmann and Jonathan Jacobs # Copyright (C) 2012-2014 Bastian Kleineidam # Copyright (C) 2015-2019 Tobias Gruetzmacher diff --git a/tox.ini b/tox.ini index a191c993a..c444554e6 100644 --- a/tox.ini +++ b/tox.ini @@ -39,6 +39,7 @@ deps = max-line-length = 100 ignore = E127,E128,E241,FI12,FI14,FI15,FI50,FI51,FI53,FI54,FI55,W504 require-code = True +no-accept-encodings = True min-version = 3.5 # Duplicated for CodeClimate...