Merge pull request #52 from keitaroinc/fix-utf8

put utf-8 encoding comment on top
keitaroinc · Apr 23, 2021 · 3abe6c0 · 3abe6c0
2 parents 5c65e57 + 5667025
commit 3abe6c0
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 14 deletions.
diff --git a/ckanext/__init__.py b/ckanext/__init__.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,8 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
-
 # this is a namespace package
 try:
     import pkg_resources

diff --git a/ckanext/saml2auth/helpers.py b/ckanext/saml2auth/helpers.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import logging
 import string
 import re

diff --git a/ckanext/saml2auth/plugin.py b/ckanext/saml2auth/plugin.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as toolkit
 

diff --git a/ckanext/saml2auth/spconfig.py b/ckanext/saml2auth/spconfig.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 from saml2.saml import NAME_FORMAT_URI
 
 from ckan.common import config as ckan_config

diff --git a/ckanext/saml2auth/tests/test_blueprint.py b/ckanext/saml2auth/tests/test_blueprint.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import os
 import pytest
 

diff --git a/ckanext/saml2auth/tests/test_blueprint_get_request.py b/ckanext/saml2auth/tests/test_blueprint_get_request.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import base64
 from datetime import datetime
 from jinja2 import Template

diff --git a/ckanext/saml2auth/tests/test_client.py b/ckanext/saml2auth/tests/test_client.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import os
 import pytest
 from ckanext.saml2auth.views.saml2auth import saml2login

diff --git a/ckanext/saml2auth/tests/test_helpers.py b/ckanext/saml2auth/tests/test_helpers.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import pytest
 
 import ckan.authz as authz

diff --git a/ckanext/saml2auth/tests/test_spconfig.py b/ckanext/saml2auth/tests/test_spconfig.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import pytest
 
 from ckanext.saml2auth.spconfig import get_config

diff --git a/ckanext/saml2auth/views/saml2auth.py b/ckanext/saml2auth/views/saml2auth.py
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# encoding: utf-8
 import logging
 import copy
 

diff --git a/conftest.py b/conftest.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,8 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# -*- coding: utf-8 -*-
-
 pytest_plugins = [
     u'ckan.tests.pytest_ckan.ckan_setup',
     u'ckan.tests.pytest_ckan.fixtures',

diff --git a/setup.py b/setup.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 """
 Copyright (c) 2020 Keitaro AB
 
@@ -15,7 +17,6 @@
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 """
 
-# -*- coding: utf-8 -*-
 # Always prefer setuptools over distutils
 from setuptools import setup, find_packages
 from codecs import open  # To use a consistent encoding