From 23cc8a994b5a8706248c2dd024ed8170658ba5a9 Mon Sep 17 00:00:00 2001 From: Simon Conseil Date: Mon, 27 Aug 2018 00:15:17 +0200 Subject: [PATCH] Remove encoding specification --- docs/conf.py | 2 -- setup.py | 2 -- sigal/__init__.py | 2 -- sigal/gallery.py | 2 -- sigal/image.py | 2 -- sigal/log.py | 2 -- sigal/pkgmeta.py | 2 -- sigal/plugins/adjust.py | 2 -- sigal/plugins/copyright.py | 2 -- sigal/plugins/extended_caching.py | 2 -- sigal/plugins/feeds.py | 2 -- sigal/plugins/media_page.py | 2 -- sigal/plugins/nomedia.py | 2 -- sigal/plugins/upload_s3.py | 2 -- sigal/plugins/watermark.py | 2 -- sigal/settings.py | 2 -- sigal/signals.py | 2 -- sigal/templates/sigal.conf.py | 2 -- sigal/utils.py | 2 -- sigal/video.py | 2 -- sigal/writer.py | 2 -- tests/conftest.py | 2 -- tests/sample/sigal.conf.py | 2 -- tests/test_cli.py | 2 -- tests/test_compress_assets_plugin.py | 2 -- tests/test_extended_caching.py | 2 -- tests/test_gallery.py | 2 -- tests/test_image.py | 2 -- tests/test_plugins.py | 2 -- tests/test_settings.py | 12 ++---------- tests/test_utils.py | 2 -- tests/test_video.py | 2 -- tests/test_zip.py | 2 -- 33 files changed, 2 insertions(+), 74 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 401118c..500990a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import os import re import sys diff --git a/setup.py b/setup.py index e2a5b07..787aaaa 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import sys from setuptools import setup, find_packages diff --git a/sigal/__init__.py b/sigal/__init__.py index 50b52dc..a5d049d 100644 --- a/sigal/__init__.py +++ b/sigal/__init__.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/gallery.py b/sigal/gallery.py index e649b6f..324e67f 100644 --- a/sigal/gallery.py +++ b/sigal/gallery.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Copyright (c) 2013 - Christophe-Marie Duquesne # Copyright (c) 2014 - Jonas Kaufmann diff --git a/sigal/image.py b/sigal/image.py index 524239d..728a1e1 100644 --- a/sigal/image.py +++ b/sigal/image.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Copyright (c) 2015 - François D. # Copyright (c) 2018 - Edwin Steele diff --git a/sigal/log.py b/sigal/log.py index 5f1de35..c5d2972 100644 --- a/sigal/log.py +++ b/sigal/log.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2013-2018 - Simon Conseil # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/pkgmeta.py b/sigal/pkgmeta.py index 203f043..a25a837 100644 --- a/sigal/pkgmeta.py +++ b/sigal/pkgmeta.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2013-2018 - Simon Conseil # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/plugins/adjust.py b/sigal/plugins/adjust.py index eb6b0f5..4b7ba51 100644 --- a/sigal/plugins/adjust.py +++ b/sigal/plugins/adjust.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - """Plugin which adjust the image after resizing. Based on pilkit's Adjust_ processor. diff --git a/sigal/plugins/copyright.py b/sigal/plugins/copyright.py index 62d405c..5218866 100644 --- a/sigal/plugins/copyright.py +++ b/sigal/plugins/copyright.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - """Plugin which add a copyright to the image. Settings: diff --git a/sigal/plugins/extended_caching.py b/sigal/plugins/extended_caching.py index d8f225d..536bf7d 100644 --- a/sigal/plugins/extended_caching.py +++ b/sigal/plugins/extended_caching.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Copyright 2017 - Tilman 't.animal' Adler # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/plugins/feeds.py b/sigal/plugins/feeds.py index 3a35731..72567d0 100644 --- a/sigal/plugins/feeds.py +++ b/sigal/plugins/feeds.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - """Plugin which add RSS/ATOM feeds. This plugin requires feedgenerator_. It uses all the images and videos of the diff --git a/sigal/plugins/media_page.py b/sigal/plugins/media_page.py index 1d7c632..a5a332d 100644 --- a/sigal/plugins/media_page.py +++ b/sigal/plugins/media_page.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Copyright (c) 2014 - Jamie Starke diff --git a/sigal/plugins/nomedia.py b/sigal/plugins/nomedia.py index 099bc8d..8881e77 100644 --- a/sigal/plugins/nomedia.py +++ b/sigal/plugins/nomedia.py @@ -1,5 +1,3 @@ -# encoding: utf-8 - # Copyright 2017 - Tilman 't.animal' Adler # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/plugins/upload_s3.py b/sigal/plugins/upload_s3.py index cbe196f..d13d4ab 100644 --- a/sigal/plugins/upload_s3.py +++ b/sigal/plugins/upload_s3.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - """Plugin to upload generated files to Amazon S3. This plugin requires boto_. All generated files are uploaded to a specified S3 diff --git a/sigal/plugins/watermark.py b/sigal/plugins/watermark.py index ad2ed08..7b4ae0b 100644 --- a/sigal/plugins/watermark.py +++ b/sigal/plugins/watermark.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2005 - Shane Hathaway (http://code.activestate.com/recipes/362879-watermark-with-pil/) # Copyright (c) 2015 - Abdul Qabiz diff --git a/sigal/settings.py b/sigal/settings.py index 83d1718..58b12be 100644 --- a/sigal/settings.py +++ b/sigal/settings.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Copyright (c) 2013 - Christophe-Marie Duquesne # Copyright (c) 2017 - Mate Lakat diff --git a/sigal/signals.py b/sigal/signals.py index f6e82d5..a4a8cf6 100644 --- a/sigal/signals.py +++ b/sigal/signals.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - from blinker import signal img_resized = signal('img_resized') diff --git a/sigal/templates/sigal.conf.py b/sigal/templates/sigal.conf.py index d2ca6b9..9b4d599 100644 --- a/sigal/templates/sigal.conf.py +++ b/sigal/templates/sigal.conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # All configuration values have a default; values that are commented out serve # to show the default. Default values are specified when modified in this # example config file diff --git a/sigal/utils.py b/sigal/utils.py index 642641d..eb129b6 100644 --- a/sigal/utils.py +++ b/sigal/utils.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - # Copyright (c) 2011-2018 - Simon Conseil # Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/sigal/video.py b/sigal/video.py index 291d19c..c53980f 100644 --- a/sigal/video.py +++ b/sigal/video.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2013 - Christophe-Marie Duquesne # Copyright (c) 2013-2018 - Simon Conseil diff --git a/sigal/writer.py b/sigal/writer.py index f638870..1424287 100644 --- a/sigal/writer.py +++ b/sigal/writer.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - # Copyright (c) 2009-2018 - Simon Conseil # Copyright (c) 2013 - Christophe-Marie Duquesne diff --git a/tests/conftest.py b/tests/conftest.py index b80dc86..6b4beed 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import blinker import os import PIL diff --git a/tests/sample/sigal.conf.py b/tests/sample/sigal.conf.py index 12fa739..7fbf5ab 100644 --- a/tests/sample/sigal.conf.py +++ b/tests/sample/sigal.conf.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - author = 'John Doe' title = 'Sigal test gallery ☺' source = 'pictures' diff --git a/tests/test_cli.py b/tests/test_cli.py index 089c0bd..ba55a4b 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import logging import os from click.testing import CliRunner diff --git a/tests/test_compress_assets_plugin.py b/tests/test_compress_assets_plugin.py index 5429f79..346b8ed 100644 --- a/tests/test_compress_assets_plugin.py +++ b/tests/test_compress_assets_plugin.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import sys diff --git a/tests/test_extended_caching.py b/tests/test_extended_caching.py index 2d27d42..770ccdc 100644 --- a/tests/test_extended_caching.py +++ b/tests/test_extended_caching.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import pickle import pytest diff --git a/tests/test_gallery.py b/tests/test_gallery.py index 1a6be80..afc4d44 100644 --- a/tests/test_gallery.py +++ b/tests/test_gallery.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import locale import logging import os diff --git a/tests/test_image.py b/tests/test_image.py index 9c1d805..f19c94e 100644 --- a/tests/test_image.py +++ b/tests/test_image.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import PIL import pytest diff --git a/tests/test_plugins.py b/tests/test_plugins.py index c3d8ad8..fac7a65 100644 --- a/tests/test_plugins.py +++ b/tests/test_plugins.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os from sigal.gallery import Gallery diff --git a/tests/test_settings.py b/tests/test_settings.py index 8bd0cd8..471c8d3 100644 --- a/tests/test_settings.py +++ b/tests/test_settings.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os from sigal.settings import read_settings, get_thumb @@ -35,10 +33,7 @@ def test_img_sizes(tmpdir): """Test that image size is swaped if needed.""" conf = tmpdir.join('sigal.conf.py') - conf.write("""# -*- coding: utf-8 -*- - -thumb_size = (150, 200) -""") + conf.write("thumb_size = (150, 200)") settings = read_settings(str(conf)) assert settings['thumb_size'] == (200, 150) @@ -50,10 +45,7 @@ def test_theme_path(tmpdir): tmpdir.join('theme').mkdir() tmpdir.join('theme').join('templates').mkdir() conf = tmpdir.join('sigal.conf.py') - conf.write("""# -*- coding: utf-8 -*- - -theme = 'theme' -""") + conf.write("theme = 'theme'") settings = read_settings(str(conf)) assert settings['theme'] == tmpdir.join('theme') diff --git a/tests/test_utils.py b/tests/test_utils.py index 3f91704..4541f82 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import os from sigal import utils diff --git a/tests/test_video.py b/tests/test_video.py index 2f5a6f1..342a41a 100644 --- a/tests/test_video.py +++ b/tests/test_video.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import pytest diff --git a/tests/test_zip.py b/tests/test_zip.py index 12f6fe3..5f19544 100644 --- a/tests/test_zip.py +++ b/tests/test_zip.py @@ -1,5 +1,3 @@ -# -*- coding:utf-8 -*- - import os import glob import zipfile