diff --git a/Makefile b/Makefile index 1f1ad357b..e75b19698 100644 --- a/Makefile +++ b/Makefile @@ -86,3 +86,7 @@ deb: comics: ./dosage -v @@ > comics.log 2>&1 + +.PHONY: update-copyright +update-copyright: + update-copyright --holder="Bastian Kleineidam" diff --git a/dosage b/dosage index 409933c54..523139174 100755 --- a/dosage +++ b/dosage @@ -1,7 +1,9 @@ #!/usr/bin/env python +# -*- coding: iso-8859-1 -*- # Dosage, the webcomic downloader # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as diff --git a/dosagelib/__init__.py b/dosagelib/__init__.py index 98da5620c..853772455 100644 --- a/dosagelib/__init__.py +++ b/dosagelib/__init__.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam """ Automated webcomic downloader. Dosage traverses webcomic websites in order to download each strip of the comic. The intended use is for diff --git a/dosagelib/comic.py b/dosagelib/comic.py index ef19b863c..522d246d3 100644 --- a/dosagelib/comic.py +++ b/dosagelib/comic.py @@ -1,9 +1,12 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs import urllib2 import os import locale import rfc822 import time import shutil +# XXX why is this done?? locale.setlocale(locale.LC_ALL, '') from .output import out diff --git a/dosagelib/events.py b/dosagelib/events.py index 9a5677be5..c2ac82e9d 100644 --- a/dosagelib/events.py +++ b/dosagelib/events.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs import os.path import time import rss diff --git a/dosagelib/helpers.py b/dosagelib/helpers.py index d3b676b78..1741a1e28 100644 --- a/dosagelib/helpers.py +++ b/dosagelib/helpers.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam import re from .util import fetchUrl, fetchManyUrls, getQueryParams diff --git a/dosagelib/output.py b/dosagelib/output.py index 5ebe4fa9d..24443c47a 100644 --- a/dosagelib/output.py +++ b/dosagelib/output.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam import time class Output(object): diff --git a/dosagelib/plugins/__init__.py b/dosagelib/plugins/__init__.py index 8b1378917..5d3edfa55 100644 --- a/dosagelib/plugins/__init__.py +++ b/dosagelib/plugins/__init__.py @@ -1 +1 @@ - +# -*- coding: iso-8859-1 -*- diff --git a/dosagelib/plugins/a.py b/dosagelib/plugins/a.py index 097afe130..dc2208ad9 100644 --- a/dosagelib/plugins/a.py +++ b/dosagelib/plugins/a.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, MULTILINE from ..helpers import _BasicScraper, regexNamer, bounceStarter, indirectStarter diff --git a/dosagelib/plugins/b.py b/dosagelib/plugins/b.py index ca5db7263..0b9486bc6 100644 --- a/dosagelib/plugins/b.py +++ b/dosagelib/plugins/b.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/c.py b/dosagelib/plugins/c.py index 705cfb9a8..ed82c6749 100644 --- a/dosagelib/plugins/c.py +++ b/dosagelib/plugins/c.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import ( diff --git a/dosagelib/plugins/d.py b/dosagelib/plugins/d.py index e75eaa609..ddadcab2b 100644 --- a/dosagelib/plugins/d.py +++ b/dosagelib/plugins/d.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE, MULTILINE from ..helpers import _BasicScraper, bounceStarter, indirectStarter diff --git a/dosagelib/plugins/drunkduck.py b/dosagelib/plugins/drunkduck.py index 41d691481..402c08d32 100644 --- a/dosagelib/plugins/drunkduck.py +++ b/dosagelib/plugins/drunkduck.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, bounceStarter, queryNamer diff --git a/dosagelib/plugins/e.py b/dosagelib/plugins/e.py index b2b905ff1..bc7eea357 100644 --- a/dosagelib/plugins/e.py +++ b/dosagelib/plugins/e.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/f.py b/dosagelib/plugins/f.py index 6b9ffddde..6a4249a26 100644 --- a/dosagelib/plugins/f.py +++ b/dosagelib/plugins/f.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE, MULTILINE from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/g.py b/dosagelib/plugins/g.py index d8617f04a..c5b2b140c 100644 --- a/dosagelib/plugins/g.py +++ b/dosagelib/plugins/g.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/h.py b/dosagelib/plugins/h.py index bbaf9e832..3e34fd0ea 100644 --- a/dosagelib/plugins/h.py +++ b/dosagelib/plugins/h.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/i.py b/dosagelib/plugins/i.py index cfb92568d..b5ed19056 100644 --- a/dosagelib/plugins/i.py +++ b/dosagelib/plugins/i.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/j.py b/dosagelib/plugins/j.py index 6a68af478..adbe635dd 100644 --- a/dosagelib/plugins/j.py +++ b/dosagelib/plugins/j.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, MULTILINE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/k.py b/dosagelib/plugins/k.py index 8b852ef24..66027e024 100644 --- a/dosagelib/plugins/k.py +++ b/dosagelib/plugins/k.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/keenspot.py b/dosagelib/plugins/keenspot.py index 777223787..bbf5aa697 100644 --- a/dosagelib/plugins/keenspot.py +++ b/dosagelib/plugins/keenspot.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/l.py b/dosagelib/plugins/l.py index 09ae4443f..f662b38d6 100644 --- a/dosagelib/plugins/l.py +++ b/dosagelib/plugins/l.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/m.py b/dosagelib/plugins/m.py index 4c618941f..5849db562 100644 --- a/dosagelib/plugins/m.py +++ b/dosagelib/plugins/m.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, queryNamer diff --git a/dosagelib/plugins/n.py b/dosagelib/plugins/n.py index 8f652e6fd..66ac9b95f 100644 --- a/dosagelib/plugins/n.py +++ b/dosagelib/plugins/n.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, indirectStarter, _PHPScraper diff --git a/dosagelib/plugins/num.py b/dosagelib/plugins/num.py index 184c732b0..b20c4f9d4 100644 --- a/dosagelib/plugins/num.py +++ b/dosagelib/plugins/num.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/o.py b/dosagelib/plugins/o.py index b8feb60e3..726086bdb 100644 --- a/dosagelib/plugins/o.py +++ b/dosagelib/plugins/o.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/p.py b/dosagelib/plugins/p.py index 143193e03..496d2926c 100644 --- a/dosagelib/plugins/p.py +++ b/dosagelib/plugins/p.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, bounceStarter, queryNamer diff --git a/dosagelib/plugins/q.py b/dosagelib/plugins/q.py index a9df28a74..c721317b7 100644 --- a/dosagelib/plugins/q.py +++ b/dosagelib/plugins/q.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/r.py b/dosagelib/plugins/r.py index 52755fafe..58016469f 100644 --- a/dosagelib/plugins/r.py +++ b/dosagelib/plugins/r.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper, bounceStarter diff --git a/dosagelib/plugins/s.py b/dosagelib/plugins/s.py index a83e984c1..eb56bb114 100644 --- a/dosagelib/plugins/s.py +++ b/dosagelib/plugins/s.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, MULTILINE, IGNORECASE, sub from os.path import splitext diff --git a/dosagelib/plugins/t.py b/dosagelib/plugins/t.py index 16294f2d1..c9b8559d4 100644 --- a/dosagelib/plugins/t.py +++ b/dosagelib/plugins/t.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, indirectStarter diff --git a/dosagelib/plugins/u.py b/dosagelib/plugins/u.py index 123f64153..164104d38 100644 --- a/dosagelib/plugins/u.py +++ b/dosagelib/plugins/u.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE from ..helpers import _BasicScraper, bounceStarter, indirectStarter diff --git a/dosagelib/plugins/uc.py b/dosagelib/plugins/uc.py index 8b9522154..78e88e350 100644 --- a/dosagelib/plugins/uc.py +++ b/dosagelib/plugins/uc.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE, sub from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/v.py b/dosagelib/plugins/v.py index d93b906fc..eae02598b 100644 --- a/dosagelib/plugins/v.py +++ b/dosagelib/plugins/v.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE, MULTILINE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/w.py b/dosagelib/plugins/w.py index ce414e0e5..6ac858607 100644 --- a/dosagelib/plugins/w.py +++ b/dosagelib/plugins/w.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, IGNORECASE, DOTALL from ..helpers import _BasicScraper, queryNamer, bounceStarter diff --git a/dosagelib/plugins/x.py b/dosagelib/plugins/x.py index 3994d1aa6..d9861822c 100644 --- a/dosagelib/plugins/x.py +++ b/dosagelib/plugins/x.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper, bounceStarter diff --git a/dosagelib/plugins/y.py b/dosagelib/plugins/y.py index b24066cf5..13f030d0d 100644 --- a/dosagelib/plugins/y.py +++ b/dosagelib/plugins/y.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile, MULTILINE from ..helpers import _BasicScraper diff --git a/dosagelib/plugins/z.py b/dosagelib/plugins/z.py index d464771f4..492c0ea5e 100644 --- a/dosagelib/plugins/z.py +++ b/dosagelib/plugins/z.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from re import compile from ..helpers import _BasicScraper diff --git a/dosagelib/progress.py b/dosagelib/progress.py index b3df2e4f3..1c90cef79 100644 --- a/dosagelib/progress.py +++ b/dosagelib/progress.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs from __future__ import division import sys diff --git a/dosagelib/rss.py b/dosagelib/rss.py index 9e150a299..f2c0a1f56 100644 --- a/dosagelib/rss.py +++ b/dosagelib/rss.py @@ -1,3 +1,5 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs # TODO: Not sure if this RSS output is "valid", should be though. # Might also be nice categorise Comics under one Item diff --git a/dosagelib/scraper.py b/dosagelib/scraper.py index efb0bc09d..6a3621744 100644 --- a/dosagelib/scraper.py +++ b/dosagelib/scraper.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam import os import sys diff --git a/dosagelib/util.py b/dosagelib/util.py index 6d3654cab..6da682b02 100644 --- a/dosagelib/util.py +++ b/dosagelib/util.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam from __future__ import division import urllib2, urlparse diff --git a/setup.py b/setup.py index 3b2885e8a..1a5a097ee 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,9 @@ #!/usr/bin/env python +# -*- coding: iso-8859-1 -*- # Dosage, the webcomic downloader # Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam # # This program is free software; you can redistribute it and/or modify # it under the terms of version 2 of the GNU General Public License as diff --git a/tests/__init__.py b/tests/__init__.py index e69de29bb..5d3edfa55 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -0,0 +1 @@ +# -*- coding: iso-8859-1 -*- diff --git a/tests/test_comics.py b/tests/test_comics.py index 31a1fef85..71bc4811b 100644 --- a/tests/test_comics.py +++ b/tests/test_comics.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam import tempfile import shutil from itertools import izip diff --git a/tests/test_util.py b/tests/test_util.py index 3166ea30b..76de7c7d9 100644 --- a/tests/test_util.py +++ b/tests/test_util.py @@ -1,3 +1,6 @@ +# -*- coding: iso-8859-1 -*- +# Copyright (C) 2004-2005 Tristan Seligmann and Jonathan Jacobs +# Copyright (C) 2012 Bastian Kleineidam import re from unittest import TestCase