diff --git a/ckan/__init__.py b/ckan/__init__.py index e798f015977..28c91910ace 100644 --- a/ckan/__init__.py +++ b/ckan/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + __version__ = '2.6.0a' __description__ = 'CKAN Software' diff --git a/ckan/authz.py b/ckan/authz.py index 715127d8d9c..4f169e0480a 100644 --- a/ckan/authz.py +++ b/ckan/authz.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sys import re from logging import getLogger diff --git a/ckan/ckan_nose_plugin.py b/ckan/ckan_nose_plugin.py index 12649693588..4316391e49d 100644 --- a/ckan/ckan_nose_plugin.py +++ b/ckan/ckan_nose_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.plugins import Plugin from inspect import isclass import hashlib diff --git a/ckan/common.py b/ckan/common.py index 9b27a402ac2..c711c1e48b5 100644 --- a/ckan/common.py +++ b/ckan/common.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # This file contains commonly used parts of external libraries. The idea is # to help in removing helpers from being used as a dependency by many files # but at the same time making it easy to change for example the json lib diff --git a/ckan/config/environment.py b/ckan/config/environment.py index 131a794f18c..e052cc174b4 100644 --- a/ckan/config/environment.py +++ b/ckan/config/environment.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + """Pylons environment configuration""" import os import logging diff --git a/ckan/config/install.py b/ckan/config/install.py index 521c528d218..d6cb33c9fe6 100644 --- a/ckan/config/install.py +++ b/ckan/config/install.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from pylons.util import PylonsInstaller diff --git a/ckan/config/middleware.py b/ckan/config/middleware.py index 4b08dd472bf..acd2523f948 100644 --- a/ckan/config/middleware.py +++ b/ckan/config/middleware.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """Pylons middleware initialization""" import urllib import urllib2 diff --git a/ckan/config/routing.py b/ckan/config/routing.py index 15a879fe5dd..c5f12df9f7c 100644 --- a/ckan/config/routing.py +++ b/ckan/config/routing.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """Routes configuration The more specific and detailed routes should be defined first so they diff --git a/ckan/controllers/admin.py b/ckan/controllers/admin.py index 34ce0275d5d..d6768d964c9 100644 --- a/ckan/controllers/admin.py +++ b/ckan/controllers/admin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons import config import ckan.lib.base as base diff --git a/ckan/controllers/api.py b/ckan/controllers/api.py index 0db9d9b676c..ec82a4d0a82 100644 --- a/ckan/controllers/api.py +++ b/ckan/controllers/api.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os.path import logging import cgi diff --git a/ckan/controllers/error.py b/ckan/controllers/error.py index b1bc2a73b27..a1014a73468 100644 --- a/ckan/controllers/error.py +++ b/ckan/controllers/error.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import cgi from paste.urlparser import PkgResourcesParser diff --git a/ckan/controllers/feed.py b/ckan/controllers/feed.py index d0ec2e4eb53..3b41af9d80d 100644 --- a/ckan/controllers/feed.py +++ b/ckan/controllers/feed.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """ The feed controller produces Atom feeds of datasets. diff --git a/ckan/controllers/group.py b/ckan/controllers/group.py index 1ee0b66c034..bd353537aaa 100644 --- a/ckan/controllers/group.py +++ b/ckan/controllers/group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import datetime from urllib import urlencode diff --git a/ckan/controllers/home.py b/ckan/controllers/home.py index 3f76427c36c..4a8cdbb26d4 100644 --- a/ckan/controllers/home.py +++ b/ckan/controllers/home.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons import config, cache import sqlalchemy.exc diff --git a/ckan/controllers/organization.py b/ckan/controllers/organization.py index daa2db0818a..1b53d1f01e4 100644 --- a/ckan/controllers/organization.py +++ b/ckan/controllers/organization.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re import ckan.controllers.group as group diff --git a/ckan/controllers/package.py b/ckan/controllers/package.py index 0064500eb35..5b41aa95e81 100644 --- a/ckan/controllers/package.py +++ b/ckan/controllers/package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from urllib import urlencode import datetime diff --git a/ckan/controllers/partyline.py b/ckan/controllers/partyline.py index 7998a6b6494..30dbf6edfba 100644 --- a/ckan/controllers/partyline.py +++ b/ckan/controllers/partyline.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons.controllers import WSGIController from pylons import config diff --git a/ckan/controllers/revision.py b/ckan/controllers/revision.py index 5d2b4643ce4..2c5962f943b 100644 --- a/ckan/controllers/revision.py +++ b/ckan/controllers/revision.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from datetime import datetime, timedelta from pylons.i18n import get_lang diff --git a/ckan/controllers/storage.py b/ckan/controllers/storage.py index fab34671725..536bef679e2 100644 --- a/ckan/controllers/storage.py +++ b/ckan/controllers/storage.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Note: This is the old file store controller for CKAN < 2.2. diff --git a/ckan/controllers/template.py b/ckan/controllers/template.py index 0755b1a2cf5..d86ad79c827 100644 --- a/ckan/controllers/template.py +++ b/ckan/controllers/template.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.lib.base as base import ckan.lib.render diff --git a/ckan/controllers/user.py b/ckan/controllers/user.py index 4c6ef562d55..110c27841be 100644 --- a/ckan/controllers/user.py +++ b/ckan/controllers/user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from urllib import quote diff --git a/ckan/controllers/util.py b/ckan/controllers/util.py index 840c6833a04..97c857b0ff5 100644 --- a/ckan/controllers/util.py +++ b/ckan/controllers/util.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re import ckan.lib.base as base diff --git a/ckan/exceptions.py b/ckan/exceptions.py index bd0d009e892..370b6b3e56b 100644 --- a/ckan/exceptions.py +++ b/ckan/exceptions.py @@ -1,4 +1,6 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + + class CkanException(Exception): pass diff --git a/ckan/i18n/__init__.py b/ckan/i18n/__init__.py index 05c9f62a7e2..caf2aafab66 100644 --- a/ckan/i18n/__init__.py +++ b/ckan/i18n/__init__.py @@ -1 +1,3 @@ +# encoding: utf-8 + # Need some content here to avoid the packaging stripping it out diff --git a/ckan/i18n/check_po_files.py b/ckan/i18n/check_po_files.py index 2b8c12a0d42..56f31d37db9 100755 --- a/ckan/i18n/check_po_files.py +++ b/ckan/i18n/check_po_files.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# encoding: utf-8 + '''Script for checking for common translation mistakes in po files, see: paster check-po-files --help diff --git a/ckan/lib/activity_streams.py b/ckan/lib/activity_streams.py index 57cd1429db1..dc054e8bfd8 100644 --- a/ckan/lib/activity_streams.py +++ b/ckan/lib/activity_streams.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from webhelpers.html import literal diff --git a/ckan/lib/activity_streams_session_extension.py b/ckan/lib/activity_streams_session_extension.py index be9f5db7c4c..6490658f0d2 100644 --- a/ckan/lib/activity_streams_session_extension.py +++ b/ckan/lib/activity_streams_session_extension.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons import config from sqlalchemy.orm.session import SessionExtension from paste.deploy.converters import asbool diff --git a/ckan/lib/alphabet_paginate.py b/ckan/lib/alphabet_paginate.py index 89d6f34877d..0fdf8d60cf8 100644 --- a/ckan/lib/alphabet_paginate.py +++ b/ckan/lib/alphabet_paginate.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Based on webhelpers.paginator, but: * each page is for items beginning with a particular letter diff --git a/ckan/lib/app_globals.py b/ckan/lib/app_globals.py index 61df95c9ec2..9f0b32d6659 100644 --- a/ckan/lib/app_globals.py +++ b/ckan/lib/app_globals.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' The application's Globals object ''' import logging diff --git a/ckan/lib/auth_tkt.py b/ckan/lib/auth_tkt.py index 526d5e26f7a..fee688c34c3 100644 --- a/ckan/lib/auth_tkt.py +++ b/ckan/lib/auth_tkt.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import math import os diff --git a/ckan/lib/authenticator.py b/ckan/lib/authenticator.py index fb6c66b019b..05d469fbc8a 100644 --- a/ckan/lib/authenticator.py +++ b/ckan/lib/authenticator.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from zope.interface import implements diff --git a/ckan/lib/base.py b/ckan/lib/base.py index 727d7815023..059c658a1c7 100644 --- a/ckan/lib/base.py +++ b/ckan/lib/base.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """The base Controller API Provides the BaseController class for subclassing. diff --git a/ckan/lib/captcha.py b/ckan/lib/captcha.py index d85b9a6813b..b6749a3d300 100644 --- a/ckan/lib/captcha.py +++ b/ckan/lib/captcha.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons import config import urllib diff --git a/ckan/lib/celery_app.py b/ckan/lib/celery_app.py index f95fcae3447..ee648724cdd 100644 --- a/ckan/lib/celery_app.py +++ b/ckan/lib/celery_app.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ConfigParser import os import logging diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py index bda40f6b832..86537863c3b 100644 --- a/ckan/lib/cli.py +++ b/ckan/lib/cli.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import collections import csv import multiprocessing as mp diff --git a/ckan/lib/config_tool.py b/ckan/lib/config_tool.py index 43101216586..d5118c9d436 100644 --- a/ckan/lib/config_tool.py +++ b/ckan/lib/config_tool.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re INSERT_NEW_SECTIONS_BEFORE_SECTION = 'app:main' diff --git a/ckan/lib/create_test_data.py b/ckan/lib/create_test_data.py index 95e3679c94b..0dc4df0bda7 100644 --- a/ckan/lib/create_test_data.py +++ b/ckan/lib/create_test_data.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from collections import defaultdict import datetime diff --git a/ckan/lib/datapreview.py b/ckan/lib/datapreview.py index 73405cfe50d..da5df4dc49a 100644 --- a/ckan/lib/datapreview.py +++ b/ckan/lib/datapreview.py @@ -1,4 +1,4 @@ -# coding=UTF-8 +# encoding: utf-8 """Data previewer functions diff --git a/ckan/lib/dictization/__init__.py b/ckan/lib/dictization/__init__.py index 61d03708461..96c4c281a9f 100644 --- a/ckan/lib/dictization/__init__.py +++ b/ckan/lib/dictization/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy.orm import class_mapper import sqlalchemy diff --git a/ckan/lib/dictization/model_dictize.py b/ckan/lib/dictization/model_dictize.py index 47b62f77825..495ef712e1f 100644 --- a/ckan/lib/dictization/model_dictize.py +++ b/ckan/lib/dictization/model_dictize.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' These dictize functions generally take a domain object (such as Package) and convert it to a dictionary, including related objects (e.g. for Package it diff --git a/ckan/lib/dictization/model_save.py b/ckan/lib/dictization/model_save.py index 05f975e57e5..9420b86f5f1 100644 --- a/ckan/lib/dictization/model_save.py +++ b/ckan/lib/dictization/model_save.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import uuid import logging diff --git a/ckan/lib/email_notifications.py b/ckan/lib/email_notifications.py index a6e7d8dab62..20a6965f5f9 100644 --- a/ckan/lib/email_notifications.py +++ b/ckan/lib/email_notifications.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Code for generating email notifications for users (e.g. email notifications for new activities in your dashboard activity stream) and emailing them to the diff --git a/ckan/lib/extract.py b/ckan/lib/extract.py index 3ff7d9c9dd9..927e53f5ca2 100644 --- a/ckan/lib/extract.py +++ b/ckan/lib/extract.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from jinja2.ext import babel_extract as extract_jinja2 import lib.jinja_extensions diff --git a/ckan/lib/fanstatic_extensions.py b/ckan/lib/fanstatic_extensions.py index 5bf5f016071..28ad0e2cc49 100644 --- a/ckan/lib/fanstatic_extensions.py +++ b/ckan/lib/fanstatic_extensions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import fanstatic.core as core diff --git a/ckan/lib/fanstatic_resources.py b/ckan/lib/fanstatic_resources.py index 427e1ce9a1e..8aefb6fe5b4 100644 --- a/ckan/lib/fanstatic_resources.py +++ b/ckan/lib/fanstatic_resources.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os.path import sys import logging diff --git a/ckan/lib/formatters.py b/ckan/lib/formatters.py index 3ce8428a3ca..f731144c606 100644 --- a/ckan/lib/formatters.py +++ b/ckan/lib/formatters.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import pytz from babel import numbers diff --git a/ckan/lib/hash.py b/ckan/lib/hash.py index f2aa1198781..5f423ee650a 100644 --- a/ckan/lib/hash.py +++ b/ckan/lib/hash.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import hmac import hashlib diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 08ee4db0e47..374f1d654dc 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -1,4 +1,4 @@ -# coding=UTF-8 +# encoding: utf-8 '''Helper functions diff --git a/ckan/lib/i18n.py b/ckan/lib/i18n.py index 2f888e8a73a..a4876b159cc 100644 --- a/ckan/lib/i18n.py +++ b/ckan/lib/i18n.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from babel import Locale, localedata diff --git a/ckan/lib/jinja_extensions.py b/ckan/lib/jinja_extensions.py index 0d64bce17db..9924ca3c747 100644 --- a/ckan/lib/jinja_extensions.py +++ b/ckan/lib/jinja_extensions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from os import path import logging diff --git a/ckan/lib/jsonp.py b/ckan/lib/jsonp.py index acf6ac2c241..9f1102e7203 100644 --- a/ckan/lib/jsonp.py +++ b/ckan/lib/jsonp.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import decorator from ckan.common import json, request, response diff --git a/ckan/lib/mailer.py b/ckan/lib/mailer.py index e80a7409bb9..a93242fd15b 100644 --- a/ckan/lib/mailer.py +++ b/ckan/lib/mailer.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import smtplib import logging import uuid diff --git a/ckan/lib/maintain.py b/ckan/lib/maintain.py index 7757eee9b0e..135b9bcf4dc 100644 --- a/ckan/lib/maintain.py +++ b/ckan/lib/maintain.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' This module contains code that helps in maintaining the Ckan codebase. ''' import inspect diff --git a/ckan/lib/munge.py b/ckan/lib/munge.py index 55d5cda9d77..2f501adc422 100644 --- a/ckan/lib/munge.py +++ b/ckan/lib/munge.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # Note these functions are similar to, but separate from name/title mungers # found in the ckanext importer. That one needs to be stable to prevent # packages changing name on reimport, but these ones can be changed and diff --git a/ckan/lib/navl/__init__.py b/ckan/lib/navl/__init__.py index f72a536ed7d..fd985ec87e5 100644 --- a/ckan/lib/navl/__init__.py +++ b/ckan/lib/navl/__init__.py @@ -1 +1,3 @@ +# encoding: utf-8 + __license__ = 'MIT' diff --git a/ckan/lib/navl/dictization_functions.py b/ckan/lib/navl/dictization_functions.py index bae614adfb7..28e6b8c2083 100644 --- a/ckan/lib/navl/dictization_functions.py +++ b/ckan/lib/navl/dictization_functions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import copy import formencode as fe import inspect diff --git a/ckan/lib/navl/validators.py b/ckan/lib/navl/validators.py index 00ea380d38b..6e508c846a8 100644 --- a/ckan/lib/navl/validators.py +++ b/ckan/lib/navl/validators.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.lib.navl.dictization_functions as df from ckan.common import _ diff --git a/ckan/lib/plugins.py b/ckan/lib/plugins.py index cd22984af97..0f0067bb901 100644 --- a/ckan/lib/plugins.py +++ b/ckan/lib/plugins.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import os import sys diff --git a/ckan/lib/render.py b/ckan/lib/render.py index 1534bd0e6f7..fa2507c2192 100644 --- a/ckan/lib/render.py +++ b/ckan/lib/render.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os import re import logging diff --git a/ckan/lib/search/__init__.py b/ckan/lib/search/__init__.py index 182d2e6d1bb..7807f430bd5 100644 --- a/ckan/lib/search/__init__.py +++ b/ckan/lib/search/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import sys import cgitb diff --git a/ckan/lib/search/common.py b/ckan/lib/search/common.py index 98a0dba141a..fde64a98c09 100644 --- a/ckan/lib/search/common.py +++ b/ckan/lib/search/common.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import logging import re diff --git a/ckan/lib/search/index.py b/ckan/lib/search/index.py index b152eccac1b..5bdf82c0796 100644 --- a/ckan/lib/search/index.py +++ b/ckan/lib/search/index.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import socket import string import logging diff --git a/ckan/lib/search/query.py b/ckan/lib/search/query.py index 63e7b697117..15607e0baa7 100644 --- a/ckan/lib/search/query.py +++ b/ckan/lib/search/query.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re import logging diff --git a/ckan/lib/search/sql.py b/ckan/lib/search/sql.py index 2d1f5cccfc8..6db022815b9 100644 --- a/ckan/lib/search/sql.py +++ b/ckan/lib/search/sql.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import or_ from ckan.lib.search.query import SearchQuery import ckan.model as model diff --git a/ckan/lib/uploader.py b/ckan/lib/uploader.py index 255322b779a..9164cdbb1f2 100644 --- a/ckan/lib/uploader.py +++ b/ckan/lib/uploader.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os import cgi import pylons diff --git a/ckan/lib/util.py b/ckan/lib/util.py index 62dfe309d61..3cf19c348d1 100644 --- a/ckan/lib/util.py +++ b/ckan/lib/util.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Shared utility functions for any Python code to use. Unlike :py:mod:`ckan.lib.helpers`, the functions in this module are not diff --git a/ckan/logic/__init__.py b/ckan/logic/__init__.py index 7c9ded26c64..f1659fcbbc6 100644 --- a/ckan/logic/__init__.py +++ b/ckan/logic/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import functools import logging import re diff --git a/ckan/logic/action/__init__.py b/ckan/logic/action/__init__.py index bebe1238da9..a7cfc14ceda 100644 --- a/ckan/logic/action/__init__.py +++ b/ckan/logic/action/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from copy import deepcopy import re diff --git a/ckan/logic/action/create.py b/ckan/logic/action/create.py index c0b65f3a5ba..1917bbeb5e7 100644 --- a/ckan/logic/action/create.py +++ b/ckan/logic/action/create.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''API functions for adding data to CKAN.''' import logging diff --git a/ckan/logic/action/delete.py b/ckan/logic/action/delete.py index 17af80ba388..97265285a04 100644 --- a/ckan/logic/action/delete.py +++ b/ckan/logic/action/delete.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''API functions for deleting data from CKAN.''' import sqlalchemy as sqla diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py index e57e4a1819d..9f4945ba3f0 100644 --- a/ckan/logic/action/get.py +++ b/ckan/logic/action/get.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''API functions for searching for and getting data from CKAN.''' import uuid diff --git a/ckan/logic/action/patch.py b/ckan/logic/action/patch.py index 0137a669ce1..db377f81ad6 100644 --- a/ckan/logic/action/patch.py +++ b/ckan/logic/action/patch.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''API functions for partial updates of existing data in CKAN''' import ckan.logic.action.update as _update diff --git a/ckan/logic/action/update.py b/ckan/logic/action/update.py index 4c12129977d..f73eef82824 100644 --- a/ckan/logic/action/update.py +++ b/ckan/logic/action/update.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''API functions for updating existing data in CKAN.''' import logging diff --git a/ckan/logic/auth/__init__.py b/ckan/logic/auth/__init__.py index eb14562921c..b340aadcec2 100644 --- a/ckan/logic/auth/__init__.py +++ b/ckan/logic/auth/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Helper functions to be used in the auth check functions ''' diff --git a/ckan/logic/auth/create.py b/ckan/logic/auth/create.py index ee34afa43a0..7f9dc74bb42 100644 --- a/ckan/logic/auth/create.py +++ b/ckan/logic/auth/create.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.logic as logic import ckan.authz as authz import ckan.logic.auth as logic_auth diff --git a/ckan/logic/auth/delete.py b/ckan/logic/auth/delete.py index ca4f2463bff..3541f26774a 100644 --- a/ckan/logic/auth/delete.py +++ b/ckan/logic/auth/delete.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.logic as logic import ckan.authz as authz from ckan.logic.auth import get_group_object diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py index 5d3745cc755..4cc7ca734c3 100644 --- a/ckan/logic/auth/get.py +++ b/ckan/logic/auth/get.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.logic as logic import ckan.authz as authz from ckan.lib.base import _ diff --git a/ckan/logic/auth/patch.py b/ckan/logic/auth/patch.py index 75b06cd8d44..a5fb38b2b34 100644 --- a/ckan/logic/auth/patch.py +++ b/ckan/logic/auth/patch.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan import logic import ckan.logic.auth.update as _update diff --git a/ckan/logic/auth/update.py b/ckan/logic/auth/update.py index bee4e1d7f38..d3a6ff56e41 100644 --- a/ckan/logic/auth/update.py +++ b/ckan/logic/auth/update.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.logic as logic import ckan.authz as authz import ckan.logic.auth as logic_auth diff --git a/ckan/logic/converters.py b/ckan/logic/converters.py index b6bb694eef4..c747555e910 100644 --- a/ckan/logic/converters.py +++ b/ckan/logic/converters.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import ckan.model as model diff --git a/ckan/logic/schema.py b/ckan/logic/schema.py index c6c7c251726..24211c557b7 100644 --- a/ckan/logic/schema.py +++ b/ckan/logic/schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from formencode.validators import OneOf import ckan.model diff --git a/ckan/logic/validators.py b/ckan/logic/validators.py index f1321d7e007..c41bd23f5d1 100644 --- a/ckan/logic/validators.py +++ b/ckan/logic/validators.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import collections import datetime from itertools import count diff --git a/ckan/migration/manage.py b/ckan/migration/manage.py index f16540c472f..85da87c325b 100644 --- a/ckan/migration/manage.py +++ b/ckan/migration/manage.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# encoding: utf-8 + from migrate.versioning.shell import main main(repository='ckan/migration') diff --git a/ckan/migration/versions/001_add_existing_tables.py b/ckan/migration/versions/001_add_existing_tables.py index 7d490280f87..4335c15dacb 100644 --- a/ckan/migration/versions/001_add_existing_tables.py +++ b/ckan/migration/versions/001_add_existing_tables.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/002_add_author_and_maintainer.py b/ckan/migration/versions/002_add_author_and_maintainer.py index a81a9ec2741..4178e24ff6e 100644 --- a/ckan/migration/versions/002_add_author_and_maintainer.py +++ b/ckan/migration/versions/002_add_author_and_maintainer.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/003_add_user_object.py b/ckan/migration/versions/003_add_user_object.py index acfd408ca5a..f81529dd631 100644 --- a/ckan/migration/versions/003_add_user_object.py +++ b/ckan/migration/versions/003_add_user_object.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/004_add_group_object.py b/ckan/migration/versions/004_add_group_object.py index 5b06038ae7d..5d1c3d414d1 100644 --- a/ckan/migration/versions/004_add_group_object.py +++ b/ckan/migration/versions/004_add_group_object.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/005_add_authorization_tables.py b/ckan/migration/versions/005_add_authorization_tables.py index 1b67ebd69af..e73b72f88d4 100644 --- a/ckan/migration/versions/005_add_authorization_tables.py +++ b/ckan/migration/versions/005_add_authorization_tables.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/006_add_ratings.py b/ckan/migration/versions/006_add_ratings.py index e5b53dfa828..4af295f6577 100644 --- a/ckan/migration/versions/006_add_ratings.py +++ b/ckan/migration/versions/006_add_ratings.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/007_add_system_roles.py b/ckan/migration/versions/007_add_system_roles.py index 6a131661dfc..d7fe8094be8 100644 --- a/ckan/migration/versions/007_add_system_roles.py +++ b/ckan/migration/versions/007_add_system_roles.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/008_update_vdm_ids.py b/ckan/migration/versions/008_update_vdm_ids.py index 0017923467d..b113f1c1605 100644 --- a/ckan/migration/versions/008_update_vdm_ids.py +++ b/ckan/migration/versions/008_update_vdm_ids.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * import sqlalchemy.schema import uuid diff --git a/ckan/migration/versions/009_add_creation_timestamps.py b/ckan/migration/versions/009_add_creation_timestamps.py index e779f1d25f5..beb83d23bad 100644 --- a/ckan/migration/versions/009_add_creation_timestamps.py +++ b/ckan/migration/versions/009_add_creation_timestamps.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from datetime import datetime from sqlalchemy import * diff --git a/ckan/migration/versions/010_add_user_about.py b/ckan/migration/versions/010_add_user_about.py index deec06f830c..c4f3c10dfac 100644 --- a/ckan/migration/versions/010_add_user_about.py +++ b/ckan/migration/versions/010_add_user_about.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/011_add_package_search_vector.py b/ckan/migration/versions/011_add_package_search_vector.py index 670cedd105d..ff9eea3e5c3 100644 --- a/ckan/migration/versions/011_add_package_search_vector.py +++ b/ckan/migration/versions/011_add_package_search_vector.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/012_add_resources.py b/ckan/migration/versions/012_add_resources.py index 85378060385..2ebf11b21ed 100644 --- a/ckan/migration/versions/012_add_resources.py +++ b/ckan/migration/versions/012_add_resources.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/013_add_hash.py b/ckan/migration/versions/013_add_hash.py index ed1f69e73e6..68bb54184fe 100644 --- a/ckan/migration/versions/013_add_hash.py +++ b/ckan/migration/versions/013_add_hash.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/014_hash_2.py b/ckan/migration/versions/014_hash_2.py index 6afc76500fd..8a1e320248c 100644 --- a/ckan/migration/versions/014_hash_2.py +++ b/ckan/migration/versions/014_hash_2.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/015_remove_state_object.py b/ckan/migration/versions/015_remove_state_object.py index bffc47efe1e..0c0eda373b7 100644 --- a/ckan/migration/versions/015_remove_state_object.py +++ b/ckan/migration/versions/015_remove_state_object.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * import sqlalchemy.sql as sql diff --git a/ckan/migration/versions/016_uuids_everywhere.py b/ckan/migration/versions/016_uuids_everywhere.py index e5f645eb478..d0d7fc9e8e0 100644 --- a/ckan/migration/versions/016_uuids_everywhere.py +++ b/ckan/migration/versions/016_uuids_everywhere.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * import sqlalchemy.schema import uuid diff --git a/ckan/migration/versions/017_add_pkg_relationships.py b/ckan/migration/versions/017_add_pkg_relationships.py index 0e872d14542..f833f40dfae 100644 --- a/ckan/migration/versions/017_add_pkg_relationships.py +++ b/ckan/migration/versions/017_add_pkg_relationships.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/018_adjust_licenses.py b/ckan/migration/versions/018_adjust_licenses.py index 0067c44eab2..c428caf3a49 100644 --- a/ckan/migration/versions/018_adjust_licenses.py +++ b/ckan/migration/versions/018_adjust_licenses.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import uuid diff --git a/ckan/migration/versions/019_pkg_relationships_state.py b/ckan/migration/versions/019_pkg_relationships_state.py index f7fd28549b3..e70ad48a21c 100644 --- a/ckan/migration/versions/019_pkg_relationships_state.py +++ b/ckan/migration/versions/019_pkg_relationships_state.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/020_add_changeset.py b/ckan/migration/versions/020_add_changeset.py index 9796250d004..4c41a6c1d33 100644 --- a/ckan/migration/versions/020_add_changeset.py +++ b/ckan/migration/versions/020_add_changeset.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/022_add_group_extras.py b/ckan/migration/versions/022_add_group_extras.py index 3d7da9ba0b0..06db6479a8a 100644 --- a/ckan/migration/versions/022_add_group_extras.py +++ b/ckan/migration/versions/022_add_group_extras.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/023_add_harvesting.py b/ckan/migration/versions/023_add_harvesting.py index 40545ebfc79..038d077a199 100644 --- a/ckan/migration/versions/023_add_harvesting.py +++ b/ckan/migration/versions/023_add_harvesting.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/024_add_harvested_document.py b/ckan/migration/versions/024_add_harvested_document.py index c4f11f56252..558e98cb6df 100644 --- a/ckan/migration/versions/024_add_harvested_document.py +++ b/ckan/migration/versions/024_add_harvested_document.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/025_add_authorization_groups.py b/ckan/migration/versions/025_add_authorization_groups.py index 76e9a25a54b..75c74e672e8 100644 --- a/ckan/migration/versions/025_add_authorization_groups.py +++ b/ckan/migration/versions/025_add_authorization_groups.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * from datetime import datetime diff --git a/ckan/migration/versions/026_authorization_group_user_pk.py b/ckan/migration/versions/026_authorization_group_user_pk.py index 650202c3fcb..8e788a27c7f 100644 --- a/ckan/migration/versions/026_authorization_group_user_pk.py +++ b/ckan/migration/versions/026_authorization_group_user_pk.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * from datetime import datetime diff --git a/ckan/migration/versions/027_adjust_harvester.py b/ckan/migration/versions/027_adjust_harvester.py index c4b1d0d0809..4b4a6be39eb 100644 --- a/ckan/migration/versions/027_adjust_harvester.py +++ b/ckan/migration/versions/027_adjust_harvester.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import warnings from sqlalchemy import exc as sa_exc diff --git a/ckan/migration/versions/028_drop_harvest_source_status.py b/ckan/migration/versions/028_drop_harvest_source_status.py index f8c940a271d..0f906a92b27 100644 --- a/ckan/migration/versions/028_drop_harvest_source_status.py +++ b/ckan/migration/versions/028_drop_harvest_source_status.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/029_version_groups.py b/ckan/migration/versions/029_version_groups.py index 6e7bbd90343..4c930aa97f6 100644 --- a/ckan/migration/versions/029_version_groups.py +++ b/ckan/migration/versions/029_version_groups.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import uuid from sqlalchemy import * diff --git a/ckan/migration/versions/030_additional_user_attributes.py b/ckan/migration/versions/030_additional_user_attributes.py index cd7fd84cc98..84808afbbae 100644 --- a/ckan/migration/versions/030_additional_user_attributes.py +++ b/ckan/migration/versions/030_additional_user_attributes.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from sqlalchemy import types from migrate import * diff --git a/ckan/migration/versions/031_move_openid_to_new_field.py b/ckan/migration/versions/031_move_openid_to_new_field.py index c557d82157d..9a45cc51241 100644 --- a/ckan/migration/versions/031_move_openid_to_new_field.py +++ b/ckan/migration/versions/031_move_openid_to_new_field.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from sqlalchemy import types from migrate import * diff --git a/ckan/migration/versions/032_add_extra_info_field_to_resources.py b/ckan/migration/versions/032_add_extra_info_field_to_resources.py index 1e1d8050eb8..46ab4b98ff7 100644 --- a/ckan/migration/versions/032_add_extra_info_field_to_resources.py +++ b/ckan/migration/versions/032_add_extra_info_field_to_resources.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from sqlalchemy import types from migrate import * diff --git a/ckan/migration/versions/033_auth_group_user_id_add_conditional.py b/ckan/migration/versions/033_auth_group_user_id_add_conditional.py index ece53d9e2bc..dbe5fa6e1e6 100644 --- a/ckan/migration/versions/033_auth_group_user_id_add_conditional.py +++ b/ckan/migration/versions/033_auth_group_user_id_add_conditional.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/034_resource_group_table.py b/ckan/migration/versions/034_resource_group_table.py index e7d6890ab13..5e38e5db641 100644 --- a/ckan/migration/versions/034_resource_group_table.py +++ b/ckan/migration/versions/034_resource_group_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/035_harvesting_doc_versioning.py b/ckan/migration/versions/035_harvesting_doc_versioning.py index d10532cc031..bbdcae8e9dd 100644 --- a/ckan/migration/versions/035_harvesting_doc_versioning.py +++ b/ckan/migration/versions/035_harvesting_doc_versioning.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/036_lockdown_roles.py b/ckan/migration/versions/036_lockdown_roles.py index 1183874153b..fce82bf659f 100644 --- a/ckan/migration/versions/036_lockdown_roles.py +++ b/ckan/migration/versions/036_lockdown_roles.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import datetime diff --git a/ckan/migration/versions/037_role_anon_editor.py b/ckan/migration/versions/037_role_anon_editor.py index eebd51f5f56..e0af0557b00 100644 --- a/ckan/migration/versions/037_role_anon_editor.py +++ b/ckan/migration/versions/037_role_anon_editor.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from sqlalchemy.sql import select, and_ from migrate import * diff --git a/ckan/migration/versions/038_delete_migration_tables.py b/ckan/migration/versions/038_delete_migration_tables.py index cc6a3abbc24..72c90b24100 100644 --- a/ckan/migration/versions/038_delete_migration_tables.py +++ b/ckan/migration/versions/038_delete_migration_tables.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/039_add_expired_id_and_dates.py b/ckan/migration/versions/039_add_expired_id_and_dates.py index 56bfb2c137e..c10f5f17c7a 100644 --- a/ckan/migration/versions/039_add_expired_id_and_dates.py +++ b/ckan/migration/versions/039_add_expired_id_and_dates.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * import uuid import datetime diff --git a/ckan/migration/versions/040_reset_key_on_user.py b/ckan/migration/versions/040_reset_key_on_user.py index cb3ac141762..4acdaa2f3b4 100644 --- a/ckan/migration/versions/040_reset_key_on_user.py +++ b/ckan/migration/versions/040_reset_key_on_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/041_resource_new_fields.py b/ckan/migration/versions/041_resource_new_fields.py index 36c5772cb7b..1acd6a51dce 100644 --- a/ckan/migration/versions/041_resource_new_fields.py +++ b/ckan/migration/versions/041_resource_new_fields.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/042_user_revision_indexes.py b/ckan/migration/versions/042_user_revision_indexes.py index e03f7d567be..0be68b3885a 100644 --- a/ckan/migration/versions/042_user_revision_indexes.py +++ b/ckan/migration/versions/042_user_revision_indexes.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/043_drop_postgres_search.py b/ckan/migration/versions/043_drop_postgres_search.py index 14cf3755877..b44089a9f36 100644 --- a/ckan/migration/versions/043_drop_postgres_search.py +++ b/ckan/migration/versions/043_drop_postgres_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/044_add_task_status.py b/ckan/migration/versions/044_add_task_status.py index 3841bae9271..c9a950e1a6d 100644 --- a/ckan/migration/versions/044_add_task_status.py +++ b/ckan/migration/versions/044_add_task_status.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/045_user_name_unique.py b/ckan/migration/versions/045_user_name_unique.py index b67ea56ca07..c8873182b35 100644 --- a/ckan/migration/versions/045_user_name_unique.py +++ b/ckan/migration/versions/045_user_name_unique.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import warnings from sqlalchemy import exc as sa_exc diff --git a/ckan/migration/versions/046_drop_changesets.py b/ckan/migration/versions/046_drop_changesets.py index 239890693e5..2715b32265c 100644 --- a/ckan/migration/versions/046_drop_changesets.py +++ b/ckan/migration/versions/046_drop_changesets.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * import migrate.changeset diff --git a/ckan/migration/versions/047_rename_package_group_member.py b/ckan/migration/versions/047_rename_package_group_member.py index 128e63ac84a..1d377739e9c 100644 --- a/ckan/migration/versions/047_rename_package_group_member.py +++ b/ckan/migration/versions/047_rename_package_group_member.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/048_add_activity_streams_tables.py b/ckan/migration/versions/048_add_activity_streams_tables.py index 1cb92646fe9..079cc6fc3fa 100644 --- a/ckan/migration/versions/048_add_activity_streams_tables.py +++ b/ckan/migration/versions/048_add_activity_streams_tables.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/049_add_group_approval_status.py b/ckan/migration/versions/049_add_group_approval_status.py index 367407b0d29..a327bf2bf03 100644 --- a/ckan/migration/versions/049_add_group_approval_status.py +++ b/ckan/migration/versions/049_add_group_approval_status.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/050_term_translation_table.py b/ckan/migration/versions/050_term_translation_table.py index 074da9b3ca3..f87608c08c2 100644 --- a/ckan/migration/versions/050_term_translation_table.py +++ b/ckan/migration/versions/050_term_translation_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/051_add_tag_vocabulary.py b/ckan/migration/versions/051_add_tag_vocabulary.py index 548f7b383eb..746eff4fd3c 100644 --- a/ckan/migration/versions/051_add_tag_vocabulary.py +++ b/ckan/migration/versions/051_add_tag_vocabulary.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/052_update_member_capacities.py b/ckan/migration/versions/052_update_member_capacities.py index 22a6f33426e..971b50ecb2d 100644 --- a/ckan/migration/versions/052_update_member_capacities.py +++ b/ckan/migration/versions/052_update_member_capacities.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/053_add_group_logo.py b/ckan/migration/versions/053_add_group_logo.py index 7a31fb606db..fc1fe3bdbf9 100644 --- a/ckan/migration/versions/053_add_group_logo.py +++ b/ckan/migration/versions/053_add_group_logo.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/054_add_resource_created_date.py b/ckan/migration/versions/054_add_resource_created_date.py index 03641509c3e..2f6a0cd993d 100644 --- a/ckan/migration/versions/054_add_resource_created_date.py +++ b/ckan/migration/versions/054_add_resource_created_date.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + def upgrade(migrate_engine): migrate_engine.execute(''' ALTER TABLE resource diff --git a/ckan/migration/versions/055_update_user_and_activity_detail.py b/ckan/migration/versions/055_update_user_and_activity_detail.py index 5d349000333..7e91c2038ee 100644 --- a/ckan/migration/versions/055_update_user_and_activity_detail.py +++ b/ckan/migration/versions/055_update_user_and_activity_detail.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + def upgrade(migrate_engine): migrate_engine.execute(''' ALTER TABLE activity_detail diff --git a/ckan/migration/versions/056_add_related_table.py b/ckan/migration/versions/056_add_related_table.py index bcd909c7619..f525d38cadd 100644 --- a/ckan/migration/versions/056_add_related_table.py +++ b/ckan/migration/versions/056_add_related_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/057_tracking.py b/ckan/migration/versions/057_tracking.py index 5f2fe43ec53..9c151a177be 100644 --- a/ckan/migration/versions/057_tracking.py +++ b/ckan/migration/versions/057_tracking.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/058_add_follower_tables.py b/ckan/migration/versions/058_add_follower_tables.py index 08f7f266c4b..4ed829cc697 100644 --- a/ckan/migration/versions/058_add_follower_tables.py +++ b/ckan/migration/versions/058_add_follower_tables.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/059_add_related_count_and_flag.py b/ckan/migration/versions/059_add_related_count_and_flag.py index 29ac5a1a7a4..294e5c45a12 100644 --- a/ckan/migration/versions/059_add_related_count_and_flag.py +++ b/ckan/migration/versions/059_add_related_count_and_flag.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/060_add_system_info_table.py b/ckan/migration/versions/060_add_system_info_table.py index 993f15e7308..ceeb821036e 100644 --- a/ckan/migration/versions/060_add_system_info_table.py +++ b/ckan/migration/versions/060_add_system_info_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/061_add_follower__group_table.py b/ckan/migration/versions/061_add_follower__group_table.py index 0fd2ad89d64..5fe27e2fc9e 100644 --- a/ckan/migration/versions/061_add_follower__group_table.py +++ b/ckan/migration/versions/061_add_follower__group_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/062_add_dashboard_table.py b/ckan/migration/versions/062_add_dashboard_table.py index f5f23c82138..c820ba372d0 100644 --- a/ckan/migration/versions/062_add_dashboard_table.py +++ b/ckan/migration/versions/062_add_dashboard_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/063_org_changes.py b/ckan/migration/versions/063_org_changes.py index 55f3bcd1132..d2ce6772ad5 100644 --- a/ckan/migration/versions/063_org_changes.py +++ b/ckan/migration/versions/063_org_changes.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from migrate import * def upgrade(migrate_engine): diff --git a/ckan/migration/versions/064_add_email_last_sent_column.py b/ckan/migration/versions/064_add_email_last_sent_column.py index 2c0780d1dab..d47a74cf9f6 100644 --- a/ckan/migration/versions/064_add_email_last_sent_column.py +++ b/ckan/migration/versions/064_add_email_last_sent_column.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/065_add_email_notifications_preference.py b/ckan/migration/versions/065_add_email_notifications_preference.py index 0f9f8a8b902..ced562eb589 100644 --- a/ckan/migration/versions/065_add_email_notifications_preference.py +++ b/ckan/migration/versions/065_add_email_notifications_preference.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import * from migrate import * diff --git a/ckan/migration/versions/066_default_package_type.py b/ckan/migration/versions/066_default_package_type.py index 9190b941d90..48ccec0153d 100644 --- a/ckan/migration/versions/066_default_package_type.py +++ b/ckan/migration/versions/066_default_package_type.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): update_statement = ''' diff --git a/ckan/migration/versions/067_turn_extras_to_strings.py b/ckan/migration/versions/067_turn_extras_to_strings.py index 4659cbc6cb4..c69be512969 100644 --- a/ckan/migration/versions/067_turn_extras_to_strings.py +++ b/ckan/migration/versions/067_turn_extras_to_strings.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json def upgrade(migrate_engine): diff --git a/ckan/migration/versions/068_add_package_extras_index.py b/ckan/migration/versions/068_add_package_extras_index.py index e8a0d3c341e..1aac25089e5 100644 --- a/ckan/migration/versions/068_add_package_extras_index.py +++ b/ckan/migration/versions/068_add_package_extras_index.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/069_resource_url_and_metadata_modified.py b/ckan/migration/versions/069_resource_url_and_metadata_modified.py index b65cc4bb73d..888d146f93c 100644 --- a/ckan/migration/versions/069_resource_url_and_metadata_modified.py +++ b/ckan/migration/versions/069_resource_url_and_metadata_modified.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): update_schema = ''' diff --git a/ckan/migration/versions/070_add_activity_and_resource_indexes.py b/ckan/migration/versions/070_add_activity_and_resource_indexes.py index 2402aa39fb1..62c1a3802e0 100644 --- a/ckan/migration/versions/070_add_activity_and_resource_indexes.py +++ b/ckan/migration/versions/070_add_activity_and_resource_indexes.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/071_add_state_column_to_user_table.py b/ckan/migration/versions/071_add_state_column_to_user_table.py index 828ebfb5f44..e890b5b05be 100644 --- a/ckan/migration/versions/071_add_state_column_to_user_table.py +++ b/ckan/migration/versions/071_add_state_column_to_user_table.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model diff --git a/ckan/migration/versions/072_add_resource_view.py b/ckan/migration/versions/072_add_resource_view.py index dd857cf2f7b..57d22236a1c 100644 --- a/ckan/migration/versions/072_add_resource_view.py +++ b/ckan/migration/versions/072_add_resource_view.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute(''' BEGIN; diff --git a/ckan/migration/versions/073_update_resource_view_resource_id_constraint.py b/ckan/migration/versions/073_update_resource_view_resource_id_constraint.py index c474850d4b2..6a6d4e79cb7 100644 --- a/ckan/migration/versions/073_update_resource_view_resource_id_constraint.py +++ b/ckan/migration/versions/073_update_resource_view_resource_id_constraint.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute(''' BEGIN; diff --git a/ckan/migration/versions/074_remove_resource_groups.py b/ckan/migration/versions/074_remove_resource_groups.py index c0b26aad518..9a55dd192ec 100644 --- a/ckan/migration/versions/074_remove_resource_groups.py +++ b/ckan/migration/versions/074_remove_resource_groups.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model diff --git a/ckan/migration/versions/075_rename_view_plugins.py b/ckan/migration/versions/075_rename_view_plugins.py index 04c6e63dcbf..f23c4eb4d9b 100644 --- a/ckan/migration/versions/075_rename_view_plugins.py +++ b/ckan/migration/versions/075_rename_view_plugins.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/076_rename_view_plugins_2.py b/ckan/migration/versions/076_rename_view_plugins_2.py index 5dc14092cd3..278879e14c3 100644 --- a/ckan/migration/versions/076_rename_view_plugins_2.py +++ b/ckan/migration/versions/076_rename_view_plugins_2.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/077_add_revisions_to_system_info.py b/ckan/migration/versions/077_add_revisions_to_system_info.py index 8711be6ba66..9516a9127c0 100644 --- a/ckan/migration/versions/077_add_revisions_to_system_info.py +++ b/ckan/migration/versions/077_add_revisions_to_system_info.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import vdm.sqlalchemy diff --git a/ckan/migration/versions/078_remove_old_authz_model.py b/ckan/migration/versions/078_remove_old_authz_model.py index 8896afb2d6f..a67679c698d 100644 --- a/ckan/migration/versions/078_remove_old_authz_model.py +++ b/ckan/migration/versions/078_remove_old_authz_model.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model diff --git a/ckan/migration/versions/079_resource_revision_index.py b/ckan/migration/versions/079_resource_revision_index.py index 70d985bfce0..aeabea8349e 100644 --- a/ckan/migration/versions/079_resource_revision_index.py +++ b/ckan/migration/versions/079_resource_revision_index.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/080_continuity_id_indexes.py b/ckan/migration/versions/080_continuity_id_indexes.py index 1b223ecf47d..81641957707 100644 --- a/ckan/migration/versions/080_continuity_id_indexes.py +++ b/ckan/migration/versions/080_continuity_id_indexes.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/081_set_datastore_active.py b/ckan/migration/versions/081_set_datastore_active.py index 1ea5ddd61f9..9038450d887 100644 --- a/ckan/migration/versions/081_set_datastore_active.py +++ b/ckan/migration/versions/081_set_datastore_active.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json from sqlalchemy import create_engine from sqlalchemy.sql import text diff --git a/ckan/migration/versions/082_create_index_creator_user_id.py b/ckan/migration/versions/082_create_index_creator_user_id.py index 18bc9501822..2229d902cbe 100644 --- a/ckan/migration/versions/082_create_index_creator_user_id.py +++ b/ckan/migration/versions/082_create_index_creator_user_id.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute( ''' diff --git a/ckan/migration/versions/083_remove_related_items.py b/ckan/migration/versions/083_remove_related_items.py index befb3b13d6c..e9cc16666ce 100644 --- a/ckan/migration/versions/083_remove_related_items.py +++ b/ckan/migration/versions/083_remove_related_items.py @@ -1,3 +1,4 @@ +# encoding: utf-8 WARNING = """ diff --git a/ckan/migration/versions/084_add_metadata_created.py b/ckan/migration/versions/084_add_metadata_created.py index c7ba2ca61a1..57347c54749 100644 --- a/ckan/migration/versions/084_add_metadata_created.py +++ b/ckan/migration/versions/084_add_metadata_created.py @@ -1,3 +1,6 @@ +# encoding: utf-8 + + def upgrade(migrate_engine): migrate_engine.execute(''' ALTER TABLE package_revision diff --git a/ckan/model/__init__.py b/ckan/model/__init__.py index 3a4b8f7582b..bbb4002abc0 100644 --- a/ckan/model/__init__.py +++ b/ckan/model/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from __future__ import with_statement # necessary for python 2.5 support import warnings import logging diff --git a/ckan/model/activity.py b/ckan/model/activity.py index 4d3ae1ba299..cfd6d02e2a5 100644 --- a/ckan/model/activity.py +++ b/ckan/model/activity.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy import ( diff --git a/ckan/model/core.py b/ckan/model/core.py index 37aa6c8eabf..cd23bf20a87 100644 --- a/ckan/model/core.py +++ b/ckan/model/core.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy import Column, DateTime, Text, Boolean diff --git a/ckan/model/dashboard.py b/ckan/model/dashboard.py index 6813f3ce133..2830f7c9976 100644 --- a/ckan/model/dashboard.py +++ b/ckan/model/dashboard.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import sqlalchemy import meta diff --git a/ckan/model/domain_object.py b/ckan/model/domain_object.py index ac1b39aba43..021dc6acfdc 100644 --- a/ckan/model/domain_object.py +++ b/ckan/model/domain_object.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import sqlalchemy as sa diff --git a/ckan/model/extension.py b/ckan/model/extension.py index 17ab834bacf..b471534a45a 100644 --- a/ckan/model/extension.py +++ b/ckan/model/extension.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """ Provides bridges between the model and plugin PluginImplementationss """ diff --git a/ckan/model/follower.py b/ckan/model/follower.py index eb54cd9ca67..cc3e5729da4 100644 --- a/ckan/model/follower.py +++ b/ckan/model/follower.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import meta import datetime import sqlalchemy diff --git a/ckan/model/group.py b/ckan/model/group.py index b1046f50b22..aeef561d2c8 100644 --- a/ckan/model/group.py +++ b/ckan/model/group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy import orm, types, Column, Table, ForeignKey, or_, and_ diff --git a/ckan/model/group_extra.py b/ckan/model/group_extra.py index dac35ee0a02..9b4aa60d30e 100644 --- a/ckan/model/group_extra.py +++ b/ckan/model/group_extra.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import vdm.sqlalchemy import vdm.sqlalchemy.stateful from sqlalchemy import orm, types, Column, Table, ForeignKey diff --git a/ckan/model/license.py b/ckan/model/license.py index 1e1550dacbe..6395f79d4ab 100644 --- a/ckan/model/license.py +++ b/ckan/model/license.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import urllib2 import re diff --git a/ckan/model/meta.py b/ckan/model/meta.py index 8d89c761498..7de9773bee5 100644 --- a/ckan/model/meta.py +++ b/ckan/model/meta.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from paste.deploy.converters import asbool diff --git a/ckan/model/misc.py b/ckan/model/misc.py index 94adf7f79f4..8568e3a31fd 100644 --- a/ckan/model/misc.py +++ b/ckan/model/misc.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """ Contains miscelaneous set of DB-related functions """ diff --git a/ckan/model/modification.py b/ckan/model/modification.py index a7be9c37f51..83704b25285 100644 --- a/ckan/model/modification.py +++ b/ckan/model/modification.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from ckan.lib.search import SearchIndexError diff --git a/ckan/model/package.py b/ckan/model/package.py index c81f12ce640..60eab5fadef 100644 --- a/ckan/model/package.py +++ b/ckan/model/package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from calendar import timegm import logging diff --git a/ckan/model/package_extra.py b/ckan/model/package_extra.py index 6c5b8a2eab0..f32486e4ea7 100644 --- a/ckan/model/package_extra.py +++ b/ckan/model/package_extra.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import vdm.sqlalchemy import vdm.sqlalchemy.stateful from sqlalchemy import orm, types, Column, Table, ForeignKey diff --git a/ckan/model/package_relationship.py b/ckan/model/package_relationship.py index 9e2ce53e873..796dfae2549 100644 --- a/ckan/model/package_relationship.py +++ b/ckan/model/package_relationship.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import vdm.sqlalchemy from sqlalchemy import orm, types, Column, Table, ForeignKey diff --git a/ckan/model/rating.py b/ckan/model/rating.py index ef59d3ac236..f123822f65a 100644 --- a/ckan/model/rating.py +++ b/ckan/model/rating.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy import orm, types, Column, Table, ForeignKey diff --git a/ckan/model/resource.py b/ckan/model/resource.py index 33358afca33..c7093576953 100644 --- a/ckan/model/resource.py +++ b/ckan/model/resource.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from sqlalchemy.util import OrderedDict diff --git a/ckan/model/resource_view.py b/ckan/model/resource_view.py index bf134f15495..72804c51137 100644 --- a/ckan/model/resource_view.py +++ b/ckan/model/resource_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sqlalchemy as sa import meta diff --git a/ckan/model/system_info.py b/ckan/model/system_info.py index 94bff0b602d..371806712ce 100644 --- a/ckan/model/system_info.py +++ b/ckan/model/system_info.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' The system_info table and SystemInfo mapped class store runtime-editable configuration options. diff --git a/ckan/model/tag.py b/ckan/model/tag.py index c389e9f2aaf..c1be31eb2c3 100644 --- a/ckan/model/tag.py +++ b/ckan/model/tag.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import vdm.sqlalchemy from sqlalchemy.orm import relation from sqlalchemy import types, Column, Table, ForeignKey, and_, UniqueConstraint diff --git a/ckan/model/task_status.py b/ckan/model/task_status.py index 07310720cca..44f4295158f 100644 --- a/ckan/model/task_status.py +++ b/ckan/model/task_status.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from datetime import datetime from sqlalchemy import types, Column, Table, UniqueConstraint diff --git a/ckan/model/term_translation.py b/ckan/model/term_translation.py index 77cb2e88056..e316a030cd3 100644 --- a/ckan/model/term_translation.py +++ b/ckan/model/term_translation.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import Column, Table from sqlalchemy.types import UnicodeText import meta diff --git a/ckan/model/tracking.py b/ckan/model/tracking.py index dca69212a83..949616ce0ba 100644 --- a/ckan/model/tracking.py +++ b/ckan/model/tracking.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import types, Column, Table import meta diff --git a/ckan/model/types.py b/ckan/model/types.py index b6249633edf..b05fcf335eb 100644 --- a/ckan/model/types.py +++ b/ckan/model/types.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ## IMPORTS FIXED import datetime import copy diff --git a/ckan/model/user.py b/ckan/model/user.py index 2d2a37f4348..7a4c111caa1 100644 --- a/ckan/model/user.py +++ b/ckan/model/user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import re import os diff --git a/ckan/model/vocabulary.py b/ckan/model/vocabulary.py index 332202038be..d21a2107e3b 100644 --- a/ckan/model/vocabulary.py +++ b/ckan/model/vocabulary.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import types, Column, Table import meta diff --git a/ckan/pastertemplates/__init__.py b/ckan/pastertemplates/__init__.py index 8277b33e2b3..afcefcd8ccd 100644 --- a/ckan/pastertemplates/__init__.py +++ b/ckan/pastertemplates/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """A Paste template for creating new CKAN extensions. Usage:: diff --git a/ckan/pastertemplates/template/ckanext/__init__.py b/ckan/pastertemplates/template/ckanext/__init__.py index 2e2033b3c05..ed48ed012a3 100644 --- a/ckan/pastertemplates/template/ckanext/__init__.py +++ b/ckan/pastertemplates/template/ckanext/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckan/plugins/__init__.py b/ckan/plugins/__init__.py index 1a84eee628e..88770d90f90 100644 --- a/ckan/plugins/__init__.py +++ b/ckan/plugins/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.plugins.core import * from ckan.plugins.interfaces import * diff --git a/ckan/plugins/core.py b/ckan/plugins/core.py index 864805590d0..f52b8ace507 100644 --- a/ckan/plugins/core.py +++ b/ckan/plugins/core.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Provides plugin services to the CKAN ''' diff --git a/ckan/plugins/interfaces.py b/ckan/plugins/interfaces.py index e29d390f132..b2907c8076a 100644 --- a/ckan/plugins/interfaces.py +++ b/ckan/plugins/interfaces.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''A collection of interfaces that CKAN plugins can implement to customize and extend CKAN. diff --git a/ckan/plugins/toolkit.py b/ckan/plugins/toolkit.py index bf39c0899a2..06a63722a24 100644 --- a/ckan/plugins/toolkit.py +++ b/ckan/plugins/toolkit.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sys diff --git a/ckan/plugins/toolkit_sphinx_extension.py b/ckan/plugins/toolkit_sphinx_extension.py index 8ee7ed9ef4e..52602ceb3fd 100644 --- a/ckan/plugins/toolkit_sphinx_extension.py +++ b/ckan/plugins/toolkit_sphinx_extension.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''A Sphinx extension to automatically document CKAN's crazy plugins toolkit, autodoc-style. diff --git a/ckan/templates/revision/__init__.py b/ckan/templates/revision/__init__.py index b646540d6be..b9445d545fe 100644 --- a/ckan/templates/revision/__init__.py +++ b/ckan/templates/revision/__init__.py @@ -1 +1,3 @@ +# encoding: utf-8 + # empty file needed for pylons to find templates in this directory diff --git a/ckan/tests/config/test_environment.py b/ckan/tests/config/test_environment.py index c6356b307c0..f9c5533a89e 100644 --- a/ckan/tests/config/test_environment.py +++ b/ckan/tests/config/test_environment.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from nose import tools as nosetools diff --git a/ckan/tests/config/test_middleware.py b/ckan/tests/config/test_middleware.py index 630c85e9b28..623341185b7 100644 --- a/ckan/tests/config/test_middleware.py +++ b/ckan/tests/config/test_middleware.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import mock import wsgiref from nose.tools import assert_equals, assert_not_equals, eq_ diff --git a/ckan/tests/controllers/__init__.py b/ckan/tests/controllers/__init__.py index b8c305f37df..4f48ec7afd4 100644 --- a/ckan/tests/controllers/__init__.py +++ b/ckan/tests/controllers/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' Controller tests probably shouldn't use mocking. diff --git a/ckan/tests/controllers/test_admin.py b/ckan/tests/controllers/test_admin.py index 9cab3cd7c0f..3e1d623011f 100644 --- a/ckan/tests/controllers/test_admin.py +++ b/ckan/tests/controllers/test_admin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_true, assert_equal from bs4 import BeautifulSoup diff --git a/ckan/tests/controllers/test_api.py b/ckan/tests/controllers/test_api.py index 36b666d21aa..9cab9d2c1dd 100644 --- a/ckan/tests/controllers/test_api.py +++ b/ckan/tests/controllers/test_api.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' NB Don't test logic functions here. This is just for the mechanics of the API controller itself. diff --git a/ckan/tests/controllers/test_feed.py b/ckan/tests/controllers/test_feed.py index 2293ae5118a..0fc448544eb 100644 --- a/ckan/tests/controllers/test_feed.py +++ b/ckan/tests/controllers/test_feed.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from routes import url_for from ckan import model diff --git a/ckan/tests/controllers/test_group.py b/ckan/tests/controllers/test_group.py index b80724dc5b2..bae63cafc45 100644 --- a/ckan/tests/controllers/test_group.py +++ b/ckan/tests/controllers/test_group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from bs4 import BeautifulSoup from nose.tools import assert_equal, assert_true diff --git a/ckan/tests/controllers/test_home.py b/ckan/tests/controllers/test_home.py index 6bb6d3b28fc..44731868635 100644 --- a/ckan/tests/controllers/test_home.py +++ b/ckan/tests/controllers/test_home.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + from nose.tools import eq_ from ckan.lib.helpers import url_for from bs4 import BeautifulSoup diff --git a/ckan/tests/controllers/test_organization.py b/ckan/tests/controllers/test_organization.py index 549a92aa9f1..b8e038bcf1e 100644 --- a/ckan/tests/controllers/test_organization.py +++ b/ckan/tests/controllers/test_organization.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from bs4 import BeautifulSoup from nose.tools import assert_equal, assert_true from routes import url_for diff --git a/ckan/tests/controllers/test_package.py b/ckan/tests/controllers/test_package.py index dd4524747ab..cab8b9e4092 100644 --- a/ckan/tests/controllers/test_package.py +++ b/ckan/tests/controllers/test_package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from bs4 import BeautifulSoup from nose.tools import ( assert_equal, diff --git a/ckan/tests/controllers/test_tags.py b/ckan/tests/controllers/test_tags.py index a1a01ca6a96..d8c17933515 100644 --- a/ckan/tests/controllers/test_tags.py +++ b/ckan/tests/controllers/test_tags.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import math import string diff --git a/ckan/tests/controllers/test_user.py b/ckan/tests/controllers/test_user.py index cf78056b79c..5929dc528d6 100644 --- a/ckan/tests/controllers/test_user.py +++ b/ckan/tests/controllers/test_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from bs4 import BeautifulSoup from nose.tools import assert_true, assert_false, assert_equal diff --git a/ckan/tests/controllers/test_util.py b/ckan/tests/controllers/test_util.py index 51572273c57..adb02e03657 100644 --- a/ckan/tests/controllers/test_util.py +++ b/ckan/tests/controllers/test_util.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from pylons.test import pylonsapp import paste.fixture diff --git a/ckan/tests/factories.py b/ckan/tests/factories.py index 3f364c19a84..0ebdfa33807 100644 --- a/ckan/tests/factories.py +++ b/ckan/tests/factories.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''This is a collection of factory classes for building CKAN users, datasets, etc. diff --git a/ckan/tests/helpers.py b/ckan/tests/helpers.py index a1f24928739..62f8df16591 100644 --- a/ckan/tests/helpers.py +++ b/ckan/tests/helpers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''This is a collection of helper functions for use in tests. We want to avoid sharing test helper functions between test modules as diff --git a/ckan/tests/i18n/test_check_po_files.py b/ckan/tests/i18n/test_check_po_files.py index 4e226940ee8..5243aeeaecd 100644 --- a/ckan/tests/i18n/test_check_po_files.py +++ b/ckan/tests/i18n/test_check_po_files.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + import nose from ckan.i18n.check_po_files import (check_po_file, diff --git a/ckan/tests/legacy/__init__.py b/ckan/tests/legacy/__init__.py index b6f60733715..acaafc60b52 100644 --- a/ckan/tests/legacy/__init__.py +++ b/ckan/tests/legacy/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """Pylons application test package When the test runner finds and executes tests within this directory, diff --git a/ckan/tests/legacy/ckantestplugins.py b/ckan/tests/legacy/ckantestplugins.py index 49f81b17bd9..c7752610e20 100644 --- a/ckan/tests/legacy/ckantestplugins.py +++ b/ckan/tests/legacy/ckantestplugins.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from collections import defaultdict import ckan.plugins as p diff --git a/ckan/tests/legacy/functional/api/__init__.py b/ckan/tests/legacy/functional/api/__init__.py index 08c9762d91d..d0a6e636d32 100644 --- a/ckan/tests/legacy/functional/api/__init__.py +++ b/ckan/tests/legacy/functional/api/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal import copy diff --git a/ckan/tests/legacy/functional/api/base.py b/ckan/tests/legacy/functional/api/base.py index 4e2171c07d7..9948d0ff3d4 100644 --- a/ckan/tests/legacy/functional/api/base.py +++ b/ckan/tests/legacy/functional/api/base.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re try: from cStringIO import StringIO diff --git a/ckan/tests/legacy/functional/api/model/test_group.py b/ckan/tests/legacy/functional/api/model/test_group.py index 94be9e1ab68..e78875f7b0c 100644 --- a/ckan/tests/legacy/functional/api/model/test_group.py +++ b/ckan/tests/legacy/functional/api/model/test_group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import copy from ckan import model diff --git a/ckan/tests/legacy/functional/api/model/test_licenses.py b/ckan/tests/legacy/functional/api/model/test_licenses.py index e210fb46769..5b64b0fe362 100644 --- a/ckan/tests/legacy/functional/api/model/test_licenses.py +++ b/ckan/tests/legacy/functional/api/model/test_licenses.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model diff --git a/ckan/tests/legacy/functional/api/model/test_package.py b/ckan/tests/legacy/functional/api/model/test_package.py index b90dcfa13f4..ddf83a328cd 100644 --- a/ckan/tests/legacy/functional/api/model/test_package.py +++ b/ckan/tests/legacy/functional/api/model/test_package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import copy from nose.tools import assert_equal, assert_raises diff --git a/ckan/tests/legacy/functional/api/model/test_ratings.py b/ckan/tests/legacy/functional/api/model/test_ratings.py index 79256dfb9ce..925f3d8e9ed 100644 --- a/ckan/tests/legacy/functional/api/model/test_ratings.py +++ b/ckan/tests/legacy/functional/api/model/test_ratings.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from nose.plugins.skip import SkipTest diff --git a/ckan/tests/legacy/functional/api/model/test_relationships.py b/ckan/tests/legacy/functional/api/model/test_relationships.py index 319de10e6aa..0bdc30c84e5 100644 --- a/ckan/tests/legacy/functional/api/model/test_relationships.py +++ b/ckan/tests/legacy/functional/api/model/test_relationships.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from nose.plugins.skip import SkipTest diff --git a/ckan/tests/legacy/functional/api/model/test_revisions.py b/ckan/tests/legacy/functional/api/model/test_revisions.py index a9f1e5ac60c..f9c86d86225 100644 --- a/ckan/tests/legacy/functional/api/model/test_revisions.py +++ b/ckan/tests/legacy/functional/api/model/test_revisions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model diff --git a/ckan/tests/legacy/functional/api/model/test_tag.py b/ckan/tests/legacy/functional/api/model/test_tag.py index 7129b0ba5d5..1c96cf00ec7 100644 --- a/ckan/tests/legacy/functional/api/model/test_tag.py +++ b/ckan/tests/legacy/functional/api/model/test_tag.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import copy from nose.tools import assert_equal diff --git a/ckan/tests/legacy/functional/api/model/test_vocabulary.py b/ckan/tests/legacy/functional/api/model/test_vocabulary.py index 0491b48bd32..feb03af3717 100644 --- a/ckan/tests/legacy/functional/api/model/test_vocabulary.py +++ b/ckan/tests/legacy/functional/api/model/test_vocabulary.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan import pylons.test import paste.fixture diff --git a/ckan/tests/legacy/functional/api/test_activity.py b/ckan/tests/legacy/functional/api/test_activity.py index 99510b1d507..33b614713a6 100644 --- a/ckan/tests/legacy/functional/api/test_activity.py +++ b/ckan/tests/legacy/functional/api/test_activity.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Functional tests for the public activity streams API. This module tests the contents of the various public activity streams: diff --git a/ckan/tests/legacy/functional/api/test_api.py b/ckan/tests/legacy/functional/api/test_api.py index 7be5454d783..7c7a1756008 100644 --- a/ckan/tests/legacy/functional/api/test_api.py +++ b/ckan/tests/legacy/functional/api/test_api.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json from ckan.tests.legacy.functional.api.base import * diff --git a/ckan/tests/legacy/functional/api/test_dashboard.py b/ckan/tests/legacy/functional/api/test_dashboard.py index f27862639ff..7482dd1a839 100644 --- a/ckan/tests/legacy/functional/api/test_dashboard.py +++ b/ckan/tests/legacy/functional/api/test_dashboard.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Test for the dashboard API. This module tests the various functions of the user dashboard, such as the diff --git a/ckan/tests/legacy/functional/api/test_email_notifications.py b/ckan/tests/legacy/functional/api/test_email_notifications.py index 84a4960ad3c..fe562756570 100644 --- a/ckan/tests/legacy/functional/api/test_email_notifications.py +++ b/ckan/tests/legacy/functional/api/test_email_notifications.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import time import ckan.model as model diff --git a/ckan/tests/legacy/functional/api/test_follow.py b/ckan/tests/legacy/functional/api/test_follow.py index 3b2d00405e6..909b2e77606 100644 --- a/ckan/tests/legacy/functional/api/test_follow.py +++ b/ckan/tests/legacy/functional/api/test_follow.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Test for the follower API. This module tests following, unfollowing, getting a list of what you're diff --git a/ckan/tests/legacy/functional/api/test_misc.py b/ckan/tests/legacy/functional/api/test_misc.py index 673a0a41ca3..768bc9f57d7 100644 --- a/ckan/tests/legacy/functional/api/test_misc.py +++ b/ckan/tests/legacy/functional/api/test_misc.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from paste.deploy.converters import asbool from ckan.tests.legacy.functional.api.base import * from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests/legacy/functional/api/test_package_search.py b/ckan/tests/legacy/functional/api/test_package_search.py index 15e4b343db2..46d85f50221 100644 --- a/ckan/tests/legacy/functional/api/test_package_search.py +++ b/ckan/tests/legacy/functional/api/test_package_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_raises from nose.plugins.skip import SkipTest diff --git a/ckan/tests/legacy/functional/api/test_resource.py b/ckan/tests/legacy/functional/api/test_resource.py index e6ef1932263..e8c53593bcd 100644 --- a/ckan/tests/legacy/functional/api/test_resource.py +++ b/ckan/tests/legacy/functional/api/test_resource.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy.functional.api.base import ApiTestCase, CreateTestData from ckan.tests.legacy import TestController as ControllerTestCase from ckan import model diff --git a/ckan/tests/legacy/functional/api/test_resource_search.py b/ckan/tests/legacy/functional/api/test_resource_search.py index 24ce4411127..84dce8c627a 100644 --- a/ckan/tests/legacy/functional/api/test_resource_search.py +++ b/ckan/tests/legacy/functional/api/test_resource_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy.functional.api.base import * from ckan.tests.legacy import TestController as ControllerTestCase diff --git a/ckan/tests/legacy/functional/api/test_user.py b/ckan/tests/legacy/functional/api/test_user.py index 48d2b6f53b0..846ae8b9efe 100644 --- a/ckan/tests/legacy/functional/api/test_user.py +++ b/ckan/tests/legacy/functional/api/test_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import paste from pylons import config from nose.tools import assert_equal diff --git a/ckan/tests/legacy/functional/api/test_util.py b/ckan/tests/legacy/functional/api/test_util.py index 9bb236a47e4..9ba2adb9afe 100644 --- a/ckan/tests/legacy/functional/api/test_util.py +++ b/ckan/tests/legacy/functional/api/test_util.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model, __version__ diff --git a/ckan/tests/legacy/functional/base.py b/ckan/tests/legacy/functional/base.py index b271e984945..671a0d1d5e3 100644 --- a/ckan/tests/legacy/functional/base.py +++ b/ckan/tests/legacy/functional/base.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy.html_check import HtmlCheckMethods from ckan.tests.legacy import TestController as ControllerTestCase diff --git a/ckan/tests/legacy/functional/test_activity.py b/ckan/tests/legacy/functional/test_activity.py index af724cfef15..dccdf303bad 100644 --- a/ckan/tests/legacy/functional/test_activity.py +++ b/ckan/tests/legacy/functional/test_activity.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pylons import config from pylons.test import pylonsapp from paste.deploy.converters import asbool diff --git a/ckan/tests/legacy/functional/test_admin.py b/ckan/tests/legacy/functional/test_admin.py index 954ceaf7b1e..7737f036650 100644 --- a/ckan/tests/legacy/functional/test_admin.py +++ b/ckan/tests/legacy/functional/test_admin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model as model from ckan.tests.legacy import url_for, CreateTestData, WsgiAppCase diff --git a/ckan/tests/legacy/functional/test_error.py b/ckan/tests/legacy/functional/test_error.py index 95e144b8d65..a67a42da2fc 100644 --- a/ckan/tests/legacy/functional/test_error.py +++ b/ckan/tests/legacy/functional/test_error.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from base import FunctionalTestCase class TestError(FunctionalTestCase): diff --git a/ckan/tests/legacy/functional/test_group.py b/ckan/tests/legacy/functional/test_group.py index c67152ab9c5..0223375f232 100644 --- a/ckan/tests/legacy/functional/test_group.py +++ b/ckan/tests/legacy/functional/test_group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import mock import ckan.model as model diff --git a/ckan/tests/legacy/functional/test_package.py b/ckan/tests/legacy/functional/test_package.py index 02a9f094c60..ee342985768 100644 --- a/ckan/tests/legacy/functional/test_package.py +++ b/ckan/tests/legacy/functional/test_package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from pylons import config, c diff --git a/ckan/tests/legacy/functional/test_pagination.py b/ckan/tests/legacy/functional/test_pagination.py index 6958ad56251..596bc5fa453 100644 --- a/ckan/tests/legacy/functional/test_pagination.py +++ b/ckan/tests/legacy/functional/test_pagination.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from nose.tools import assert_equal diff --git a/ckan/tests/legacy/functional/test_preview_interface.py b/ckan/tests/legacy/functional/test_preview_interface.py index 8d01acddaa2..deb7aa6f965 100644 --- a/ckan/tests/legacy/functional/test_preview_interface.py +++ b/ckan/tests/legacy/functional/test_preview_interface.py @@ -1,4 +1,4 @@ -# -*- coding: UTF-8 -*- +# encoding: utf-8 import ckan.lib.helpers as h import ckan.logic as l diff --git a/ckan/tests/legacy/functional/test_revision.py b/ckan/tests/legacy/functional/test_revision.py index 5cc1374d8a0..af0f653fa1c 100644 --- a/ckan/tests/legacy/functional/test_revision.py +++ b/ckan/tests/legacy/functional/test_revision.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import TestController, CreateTestData, url_for import ckan.model as model diff --git a/ckan/tests/legacy/functional/test_tag.py b/ckan/tests/legacy/functional/test_tag.py index b0368c4a25d..8cd5c346a26 100644 --- a/ckan/tests/legacy/functional/test_tag.py +++ b/ckan/tests/legacy/functional/test_tag.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json from ckan.tests.legacy import * diff --git a/ckan/tests/legacy/functional/test_tracking.py b/ckan/tests/legacy/functional/test_tracking.py index f6d8d5377e9..eef23730d93 100644 --- a/ckan/tests/legacy/functional/test_tracking.py +++ b/ckan/tests/legacy/functional/test_tracking.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Functional tests for CKAN's builtin page view tracking feature.''' import tempfile diff --git a/ckan/tests/legacy/functional/test_user.py b/ckan/tests/legacy/functional/test_user.py index a7886ee468c..2aa5e6f7abe 100644 --- a/ckan/tests/legacy/functional/test_user.py +++ b/ckan/tests/legacy/functional/test_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from routes import url_for from nose.tools import assert_equal from pylons import config diff --git a/ckan/tests/legacy/html_check.py b/ckan/tests/legacy/html_check.py index a58bde6c0ae..5b549942ee6 100644 --- a/ckan/tests/legacy/html_check.py +++ b/ckan/tests/legacy/html_check.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re import sgmllib diff --git a/ckan/tests/legacy/lib/__init__.py b/ckan/tests/legacy/lib/__init__.py index bcae0da187c..2fd5a912129 100644 --- a/ckan/tests/legacy/lib/__init__.py +++ b/ckan/tests/legacy/lib/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model diff --git a/ckan/tests/legacy/lib/test_alphabet_pagination.py b/ckan/tests/legacy/lib/test_alphabet_pagination.py index 425eba01881..97d2773c634 100644 --- a/ckan/tests/legacy/lib/test_alphabet_pagination.py +++ b/ckan/tests/legacy/lib/test_alphabet_pagination.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re from nose.tools import assert_equal, assert_true, assert_in diff --git a/ckan/tests/legacy/lib/test_authenticator.py b/ckan/tests/legacy/lib/test_authenticator.py index 4da951f63cd..7032ad51245 100644 --- a/ckan/tests/legacy/lib/test_authenticator.py +++ b/ckan/tests/legacy/lib/test_authenticator.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan import ckan.lib.create_test_data as ctd diff --git a/ckan/tests/legacy/lib/test_cli.py b/ckan/tests/legacy/lib/test_cli.py index 33c093ae37c..aac453cdf7c 100644 --- a/ckan/tests/legacy/lib/test_cli.py +++ b/ckan/tests/legacy/lib/test_cli.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os import csv diff --git a/ckan/tests/legacy/lib/test_dictization.py b/ckan/tests/legacy/lib/test_dictization.py index 2564b07c9ea..864a22b06c0 100644 --- a/ckan/tests/legacy/lib/test_dictization.py +++ b/ckan/tests/legacy/lib/test_dictization.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import assert_equal, assert_not_in, assert_in from pprint import pprint, pformat from difflib import unified_diff diff --git a/ckan/tests/legacy/lib/test_dictization_schema.py b/ckan/tests/legacy/lib/test_dictization_schema.py index c3114cc3cb3..82f494ef5b4 100644 --- a/ckan/tests/legacy/lib/test_dictization_schema.py +++ b/ckan/tests/legacy/lib/test_dictization_schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from pprint import pprint, pformat from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests/legacy/lib/test_email_notifications.py b/ckan/tests/legacy/lib/test_email_notifications.py index 8116a620e0b..bd00246841a 100644 --- a/ckan/tests/legacy/lib/test_email_notifications.py +++ b/ckan/tests/legacy/lib/test_email_notifications.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Tests for the ckan.lib.email_notifications module. Note that email_notifications is used by an action function, so most of the diff --git a/ckan/tests/legacy/lib/test_hash.py b/ckan/tests/legacy/lib/test_hash.py index e24dd19b2b3..4f965660087 100644 --- a/ckan/tests/legacy/lib/test_hash.py +++ b/ckan/tests/legacy/lib/test_hash.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equals from ckan.lib.hash import get_message_hash, get_redirect diff --git a/ckan/tests/legacy/lib/test_helpers.py b/ckan/tests/legacy/lib/test_helpers.py index 6bf44f16c03..fe5d0ad7f1b 100644 --- a/ckan/tests/legacy/lib/test_helpers.py +++ b/ckan/tests/legacy/lib/test_helpers.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + import datetime from nose.tools import assert_equal, assert_raises diff --git a/ckan/tests/legacy/lib/test_i18n.py b/ckan/tests/legacy/lib/test_i18n.py index b93e69bc758..501a56eec51 100644 --- a/ckan/tests/legacy/lib/test_i18n.py +++ b/ckan/tests/legacy/lib/test_i18n.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal, assert_raises from pylons import config, session import pylons diff --git a/ckan/tests/legacy/lib/test_navl.py b/ckan/tests/legacy/lib/test_navl.py index c6d3bb6b3e1..04cfe17e158 100644 --- a/ckan/tests/legacy/lib/test_navl.py +++ b/ckan/tests/legacy/lib/test_navl.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.lib.navl.dictization_functions import (flatten_schema, get_all_key_combinations, make_full_schema, diff --git a/ckan/tests/legacy/lib/test_resource_search.py b/ckan/tests/legacy/lib/test_resource_search.py index d3176860b0f..92862ac33a5 100644 --- a/ckan/tests/legacy/lib/test_resource_search.py +++ b/ckan/tests/legacy/lib/test_resource_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from webob.multidict import UnicodeMultiDict, MultiDict from nose.tools import assert_raises, assert_equal diff --git a/ckan/tests/legacy/lib/test_simple_search.py b/ckan/tests/legacy/lib/test_simple_search.py index 64058da0f79..d271b31cf2f 100644 --- a/ckan/tests/legacy/lib/test_simple_search.py +++ b/ckan/tests/legacy/lib/test_simple_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model diff --git a/ckan/tests/legacy/lib/test_solr_package_search.py b/ckan/tests/legacy/lib/test_solr_package_search.py index 86acdd765b4..d6a64521e96 100644 --- a/ckan/tests/legacy/lib/test_solr_package_search.py +++ b/ckan/tests/legacy/lib/test_solr_package_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal, assert_raises from ckan import model diff --git a/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py b/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py index 24f1e26f4f7..45f87022eea 100644 --- a/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py +++ b/ckan/tests/legacy/lib/test_solr_package_search_synchronous_update.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan import model import ckan.lib.search as search diff --git a/ckan/tests/legacy/lib/test_solr_schema_version.py b/ckan/tests/legacy/lib/test_solr_schema_version.py index 0eea57faef4..bdbd1eb7127 100644 --- a/ckan/tests/legacy/lib/test_solr_schema_version.py +++ b/ckan/tests/legacy/lib/test_solr_schema_version.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from ckan.tests.legacy import TestController diff --git a/ckan/tests/legacy/lib/test_solr_search_index.py b/ckan/tests/legacy/lib/test_solr_search_index.py index 03f6161f93b..e1bbce3a228 100644 --- a/ckan/tests/legacy/lib/test_solr_search_index.py +++ b/ckan/tests/legacy/lib/test_solr_search_index.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import pysolr from pylons import config from ckan import model diff --git a/ckan/tests/legacy/lib/test_tag_search.py b/ckan/tests/legacy/lib/test_tag_search.py index bbe24688048..8391727c93e 100644 --- a/ckan/tests/legacy/lib/test_tag_search.py +++ b/ckan/tests/legacy/lib/test_tag_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_raises from ckan.tests.legacy import * from ckan.tests.legacy import is_search_supported diff --git a/ckan/tests/legacy/logic/test_action.py b/ckan/tests/legacy/logic/test_action.py index 2c109002bea..558b7c20407 100644 --- a/ckan/tests/legacy/logic/test_action.py +++ b/ckan/tests/legacy/logic/test_action.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import re import json import urllib diff --git a/ckan/tests/legacy/logic/test_auth.py b/ckan/tests/legacy/logic/test_auth.py index 1b70c62d93e..f7b94a681c5 100644 --- a/ckan/tests/legacy/logic/test_auth.py +++ b/ckan/tests/legacy/logic/test_auth.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import paste from pylons import config import ckan.config.middleware diff --git a/ckan/tests/legacy/logic/test_init.py b/ckan/tests/legacy/logic/test_init.py index a6033af0af6..91476c6782a 100644 --- a/ckan/tests/legacy/logic/test_init.py +++ b/ckan/tests/legacy/logic/test_init.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools as tools import ckan.model as model diff --git a/ckan/tests/legacy/logic/test_member.py b/ckan/tests/legacy/logic/test_member.py index 70487181cb5..ca500575bc6 100644 --- a/ckan/tests/legacy/logic/test_member.py +++ b/ckan/tests/legacy/logic/test_member.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_raises import ckan.model as model import ckan.logic as logic diff --git a/ckan/tests/legacy/logic/test_tag.py b/ckan/tests/legacy/logic/test_tag.py index 0419f2ffc90..f7a996e883c 100644 --- a/ckan/tests/legacy/logic/test_tag.py +++ b/ckan/tests/legacy/logic/test_tag.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json from nose.tools import assert_equal import ckan.lib.search as search diff --git a/ckan/tests/legacy/logic/test_tag_vocab.py b/ckan/tests/legacy/logic/test_tag_vocab.py index 54d921f8f3e..97b830b0f60 100644 --- a/ckan/tests/legacy/logic/test_tag_vocab.py +++ b/ckan/tests/legacy/logic/test_tag_vocab.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model as model import ckan.logic as logic import ckan.logic.converters as converters diff --git a/ckan/tests/legacy/logic/test_validators.py b/ckan/tests/legacy/logic/test_validators.py index aab45038ef7..3895d0aca02 100644 --- a/ckan/tests/legacy/logic/test_validators.py +++ b/ckan/tests/legacy/logic/test_validators.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan import model diff --git a/ckan/tests/legacy/misc/test_format_text.py b/ckan/tests/legacy/misc/test_format_text.py index 4450534b97c..144eb270a7c 100644 --- a/ckan/tests/legacy/misc/test_format_text.py +++ b/ckan/tests/legacy/misc/test_format_text.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.lib.helpers as h class TestFormatText: diff --git a/ckan/tests/legacy/misc/test_mock_mail_server.py b/ckan/tests/legacy/misc/test_mock_mail_server.py index 35b664f31a5..a0a1ae28a5d 100644 --- a/ckan/tests/legacy/misc/test_mock_mail_server.py +++ b/ckan/tests/legacy/misc/test_mock_mail_server.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import time from nose.tools import assert_equal from pylons import config diff --git a/ckan/tests/legacy/misc/test_sync.py b/ckan/tests/legacy/misc/test_sync.py index 570c12eca62..10b355e47fb 100644 --- a/ckan/tests/legacy/misc/test_sync.py +++ b/ckan/tests/legacy/misc/test_sync.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os import subprocess import urllib2 diff --git a/ckan/tests/legacy/mock_mail_server.py b/ckan/tests/legacy/mock_mail_server.py index 11719ee73f1..81db8c4c09a 100644 --- a/ckan/tests/legacy/mock_mail_server.py +++ b/ckan/tests/legacy/mock_mail_server.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import threading import asyncore import socket diff --git a/ckan/tests/legacy/mock_plugin.py b/ckan/tests/legacy/mock_plugin.py index a8f074bb823..d940591283f 100644 --- a/ckan/tests/legacy/mock_plugin.py +++ b/ckan/tests/legacy/mock_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.plugins import Plugin, SingletonPlugin class _MockPlugin(object): diff --git a/ckan/tests/legacy/models/test_activity.py b/ckan/tests/legacy/models/test_activity.py index 2aa020987fb..a052904ee76 100644 --- a/ckan/tests/legacy/models/test_activity.py +++ b/ckan/tests/legacy/models/test_activity.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model as model Activity = model.Activity diff --git a/ckan/tests/legacy/models/test_extras.py b/ckan/tests/legacy/models/test_extras.py index 86bf64f0cfa..d530af28cd8 100644 --- a/ckan/tests/legacy/models/test_extras.py +++ b/ckan/tests/legacy/models/test_extras.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import * import ckan.model as model diff --git a/ckan/tests/legacy/models/test_follower.py b/ckan/tests/legacy/models/test_follower.py index 9f4eb51ea3f..16cc3f7b23c 100644 --- a/ckan/tests/legacy/models/test_follower.py +++ b/ckan/tests/legacy/models/test_follower.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model as model import ckan.lib.create_test_data as ctd diff --git a/ckan/tests/legacy/models/test_group.py b/ckan/tests/legacy/models/test_group.py index ab4e5a5c9ac..9d0e76acd96 100644 --- a/ckan/tests/legacy/models/test_group.py +++ b/ckan/tests/legacy/models/test_group.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import assert_equal, assert_in, assert_not_in, CreateTestData import ckan.model as model diff --git a/ckan/tests/legacy/models/test_misc.py b/ckan/tests/legacy/models/test_misc.py index aa1a87b935f..11511d3d363 100644 --- a/ckan/tests/legacy/models/test_misc.py +++ b/ckan/tests/legacy/models/test_misc.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan.tests.legacy import * diff --git a/ckan/tests/legacy/models/test_package.py b/ckan/tests/legacy/models/test_package.py index f2cf593d32f..582c709beb5 100644 --- a/ckan/tests/legacy/models/test_package.py +++ b/ckan/tests/legacy/models/test_package.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan.tests.legacy import * diff --git a/ckan/tests/legacy/models/test_package_relationships.py b/ckan/tests/legacy/models/test_package_relationships.py index 63ba65f2b52..c39435785e5 100644 --- a/ckan/tests/legacy/models/test_package_relationships.py +++ b/ckan/tests/legacy/models/test_package_relationships.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import * import ckan.model as model from ckan.lib.create_test_data import CreateTestData diff --git a/ckan/tests/legacy/models/test_purge_revision.py b/ckan/tests/legacy/models/test_purge_revision.py index 1250bde0649..1b624c21216 100644 --- a/ckan/tests/legacy/models/test_purge_revision.py +++ b/ckan/tests/legacy/models/test_purge_revision.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.tests.legacy import * import ckan.model as model diff --git a/ckan/tests/legacy/models/test_resource.py b/ckan/tests/legacy/models/test_resource.py index 22401c00520..10e685f3e94 100644 --- a/ckan/tests/legacy/models/test_resource.py +++ b/ckan/tests/legacy/models/test_resource.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from sqlalchemy import MetaData, __version__ as sqav from nose.tools import assert_equal, raises diff --git a/ckan/tests/legacy/models/test_revision.py b/ckan/tests/legacy/models/test_revision.py index 4ec41da15a8..1b8ad024179 100644 --- a/ckan/tests/legacy/models/test_revision.py +++ b/ckan/tests/legacy/models/test_revision.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from nose.tools import assert_equal diff --git a/ckan/tests/legacy/models/test_user.py b/ckan/tests/legacy/models/test_user.py index 38d60b95931..1c90b30826f 100644 --- a/ckan/tests/legacy/models/test_user.py +++ b/ckan/tests/legacy/models/test_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan.tests.legacy import * diff --git a/ckan/tests/legacy/pylons_controller.py b/ckan/tests/legacy/pylons_controller.py index 6ae042ceb08..3f4bf75fa77 100644 --- a/ckan/tests/legacy/pylons_controller.py +++ b/ckan/tests/legacy/pylons_controller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''For unit testing that does not use paste fixture web requests, but needs pylons set up for access to c, g or the template engine. diff --git a/ckan/tests/legacy/schema/test_schema.py b/ckan/tests/legacy/schema/test_schema.py index 3dee3feee6f..5b5c8bf2684 100644 --- a/ckan/tests/legacy/schema/test_schema.py +++ b/ckan/tests/legacy/schema/test_schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal import ckan diff --git a/ckan/tests/legacy/test_coding_standards.py b/ckan/tests/legacy/test_coding_standards.py index 48f04dcf281..9025eb331a9 100644 --- a/ckan/tests/legacy/test_coding_standards.py +++ b/ckan/tests/legacy/test_coding_standards.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' The aim of these tests is to check and improve the coding standards in ckan. Common issues are tested for here and tests fail if they are discovered in diff --git a/ckan/tests/legacy/test_plugins.py b/ckan/tests/legacy/test_plugins.py index 954ba03bd02..61343f12a57 100644 --- a/ckan/tests/legacy/test_plugins.py +++ b/ckan/tests/legacy/test_plugins.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """ Tests for plugin loading via PCA """ diff --git a/ckan/tests/legacy/test_versions.py b/ckan/tests/legacy/test_versions.py index cfc29bd7dda..c9873e34878 100644 --- a/ckan/tests/legacy/test_versions.py +++ b/ckan/tests/legacy/test_versions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import subprocess class TestVersions(object): diff --git a/ckan/tests/lib/__init__.py b/ckan/tests/lib/__init__.py index 005e027da2d..bb5377869e0 100644 --- a/ckan/tests/lib/__init__.py +++ b/ckan/tests/lib/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''**All lib functions should have tests**. .. todo:: diff --git a/ckan/tests/lib/dictization/test_model_dictize.py b/ckan/tests/lib/dictization/test_model_dictize.py index b253aba3f38..43de44788c1 100644 --- a/ckan/tests/lib/dictization/test_model_dictize.py +++ b/ckan/tests/lib/dictization/test_model_dictize.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import copy diff --git a/ckan/tests/lib/navl/test_dictization_functions.py b/ckan/tests/lib/navl/test_dictization_functions.py index 226d6b3ef38..0e475b5b32e 100644 --- a/ckan/tests/lib/navl/test_dictization_functions.py +++ b/ckan/tests/lib/navl/test_dictization_functions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose from ckan.lib.navl.dictization_functions import validate diff --git a/ckan/tests/lib/navl/test_validators.py b/ckan/tests/lib/navl/test_validators.py index c368d128d01..b030e32fcca 100644 --- a/ckan/tests/lib/navl/test_validators.py +++ b/ckan/tests/lib/navl/test_validators.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + '''Unit tests for ckan/lib/navl/validators.py. ''' diff --git a/ckan/tests/lib/search/test_index.py b/ckan/tests/lib/search/test_index.py index 69c81e5fa24..dd783e6d500 100644 --- a/ckan/tests/lib/search/test_index.py +++ b/ckan/tests/lib/search/test_index.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import hashlib import json diff --git a/ckan/tests/lib/test_app_globals.py b/ckan/tests/lib/test_app_globals.py index 6ad6c0bf3c5..714acc4fd5c 100644 --- a/ckan/tests/lib/test_app_globals.py +++ b/ckan/tests/lib/test_app_globals.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.lib.app_globals import app_globals as g diff --git a/ckan/tests/lib/test_auth_tkt.py b/ckan/tests/lib/test_auth_tkt.py index 69cc91b07d1..dbddcfbb0dd 100644 --- a/ckan/tests/lib/test_auth_tkt.py +++ b/ckan/tests/lib/test_auth_tkt.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose import tools as nose_tools from ckan.tests import helpers diff --git a/ckan/tests/lib/test_base.py b/ckan/tests/lib/test_base.py index af9d445882f..cea90eaed51 100644 --- a/ckan/tests/lib/test_base.py +++ b/ckan/tests/lib/test_base.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose import tools as nose_tools import ckan.tests.helpers as helpers diff --git a/ckan/tests/lib/test_cli.py b/ckan/tests/lib/test_cli.py index 501e8efc174..c8ddd77222d 100644 --- a/ckan/tests/lib/test_cli.py +++ b/ckan/tests/lib/test_cli.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 import logging diff --git a/ckan/tests/lib/test_config_tool.py b/ckan/tests/lib/test_config_tool.py index 870a7178db8..5a6cda6f925 100644 --- a/ckan/tests/lib/test_config_tool.py +++ b/ckan/tests/lib/test_config_tool.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.lib import config_tool diff --git a/ckan/tests/lib/test_datapreview.py b/ckan/tests/lib/test_datapreview.py index 2374b93efe5..b2590c9413a 100644 --- a/ckan/tests/lib/test_datapreview.py +++ b/ckan/tests/lib/test_datapreview.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + import nose from pylons import config diff --git a/ckan/tests/lib/test_helpers.py b/ckan/tests/lib/test_helpers.py index d557250e4e6..010f817f096 100644 --- a/ckan/tests/lib/test_helpers.py +++ b/ckan/tests/lib/test_helpers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose import pytz import tzlocal diff --git a/ckan/tests/lib/test_mailer.py b/ckan/tests/lib/test_mailer.py index e776e8ef581..b45b41b6e47 100644 --- a/ckan/tests/lib/test_mailer.py +++ b/ckan/tests/lib/test_mailer.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal, assert_raises from pylons import config from email.mime.text import MIMEText diff --git a/ckan/tests/lib/test_munge.py b/ckan/tests/lib/test_munge.py index 6813b9919c9..50225ed7e68 100644 --- a/ckan/tests/lib/test_munge.py +++ b/ckan/tests/lib/test_munge.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from ckan.lib.munge import (munge_filename_legacy, munge_filename, munge_name, diff --git a/ckan/tests/logic/action/__init__.py b/ckan/tests/logic/action/__init__.py index 85741aa11cd..028db2e0343 100644 --- a/ckan/tests/logic/action/__init__.py +++ b/ckan/tests/logic/action/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''**All action functions should have tests.** Most action function tests will be high-level tests that both test the code in diff --git a/ckan/tests/logic/action/test_create.py b/ckan/tests/logic/action/test_create.py index f22db03bf1e..f45fa125c3b 100644 --- a/ckan/tests/logic/action/test_create.py +++ b/ckan/tests/logic/action/test_create.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/auth/create.py. ''' diff --git a/ckan/tests/logic/action/test_delete.py b/ckan/tests/logic/action/test_delete.py index ab2b25b9539..94b750a8ff2 100644 --- a/ckan/tests/logic/action/test_delete.py +++ b/ckan/tests/logic/action/test_delete.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.tests.helpers as helpers diff --git a/ckan/tests/logic/action/test_get.py b/ckan/tests/logic/action/test_get.py index 8179dcf026e..67b3de12436 100644 --- a/ckan/tests/logic/action/test_get.py +++ b/ckan/tests/logic/action/test_get.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.logic as logic diff --git a/ckan/tests/logic/action/test_patch.py b/ckan/tests/logic/action/test_patch.py index 0a848c465a4..e910b1618dc 100644 --- a/ckan/tests/logic/action/test_patch.py +++ b/ckan/tests/logic/action/test_patch.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/action/patch.py.''' import datetime diff --git a/ckan/tests/logic/action/test_update.py b/ckan/tests/logic/action/test_update.py index 69f4b78bff7..73e766368ef 100644 --- a/ckan/tests/logic/action/test_update.py +++ b/ckan/tests/logic/action/test_update.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/action/update.py.''' import datetime diff --git a/ckan/tests/logic/auth/__init__.py b/ckan/tests/logic/auth/__init__.py index 8a836cd8a52..61df1cfd8a9 100644 --- a/ckan/tests/logic/auth/__init__.py +++ b/ckan/tests/logic/auth/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''**All auth functions should have tests.** Most auth function tests should be unit tests that test the auth function in diff --git a/ckan/tests/logic/auth/test_create.py b/ckan/tests/logic/auth/test_create.py index dc4bfb97651..ba85ac84e9e 100644 --- a/ckan/tests/logic/auth/test_create.py +++ b/ckan/tests/logic/auth/test_create.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/auth/create.py. ''' diff --git a/ckan/tests/logic/auth/test_delete.py b/ckan/tests/logic/auth/test_delete.py index c69de35dd08..cd4d6018cc9 100644 --- a/ckan/tests/logic/auth/test_delete.py +++ b/ckan/tests/logic/auth/test_delete.py @@ -1,3 +1,4 @@ +# encoding: utf-8 '''Unit tests for ckan/logic/auth/delete.py. diff --git a/ckan/tests/logic/auth/test_get.py b/ckan/tests/logic/auth/test_get.py index cbea2217a5a..bbcba09df50 100644 --- a/ckan/tests/logic/auth/test_get.py +++ b/ckan/tests/logic/auth/test_get.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/auth/get.py. ''' diff --git a/ckan/tests/logic/auth/test_init.py b/ckan/tests/logic/auth/test_init.py index 96fbcb1adbc..c1c5437013e 100644 --- a/ckan/tests/logic/auth/test_init.py +++ b/ckan/tests/logic/auth/test_init.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose import ckan.model as core_model diff --git a/ckan/tests/logic/auth/test_update.py b/ckan/tests/logic/auth/test_update.py index 4b933f2fd12..aba9cf0bdf5 100644 --- a/ckan/tests/logic/auth/test_update.py +++ b/ckan/tests/logic/auth/test_update.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Unit tests for ckan/logic/auth/update.py. ''' diff --git a/ckan/tests/logic/test_conversion.py b/ckan/tests/logic/test_conversion.py index fad4c58da63..af1eb2e7868 100644 --- a/ckan/tests/logic/test_conversion.py +++ b/ckan/tests/logic/test_conversion.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Functional tests for converters in ckan/logic/converters.py. ''' diff --git a/ckan/tests/logic/test_converters.py b/ckan/tests/logic/test_converters.py index 7ea86c4c1dd..13b6f32b133 100644 --- a/ckan/tests/logic/test_converters.py +++ b/ckan/tests/logic/test_converters.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + '''Unit tests for ckan/logic/converters.py. ''' diff --git a/ckan/tests/logic/test_schema.py b/ckan/tests/logic/test_schema.py index 61cf7a32bfe..ce5a8a0fd7f 100644 --- a/ckan/tests/logic/test_schema.py +++ b/ckan/tests/logic/test_schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' We *don't* write tests for the schemas defined in :py:mod:`ckan.logic.schema`. diff --git a/ckan/tests/logic/test_validators.py b/ckan/tests/logic/test_validators.py index ed3e2da4490..8a5d854e1ce 100644 --- a/ckan/tests/logic/test_validators.py +++ b/ckan/tests/logic/test_validators.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + '''Unit tests for ckan/logic/validators.py. ''' diff --git a/ckan/tests/migration/__init__.py b/ckan/tests/migration/__init__.py index bcc2c6ca717..d94dac35161 100644 --- a/ckan/tests/migration/__init__.py +++ b/ckan/tests/migration/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''**All migration scripts should have tests.** .. todo:: diff --git a/ckan/tests/model/__init__.py b/ckan/tests/model/__init__.py index 3e31913cf96..940403d3e7b 100644 --- a/ckan/tests/model/__init__.py +++ b/ckan/tests/model/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''**All model methods should have tests**. .. todo:: diff --git a/ckan/tests/model/test_license.py b/ckan/tests/model/test_license.py index 41291bdd459..50c9510c420 100644 --- a/ckan/tests/model/test_license.py +++ b/ckan/tests/model/test_license.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from nose.tools import assert_equal diff --git a/ckan/tests/model/test_resource.py b/ckan/tests/model/test_resource.py index eeff6c4ef03..65f68bf9257 100644 --- a/ckan/tests/model/test_resource.py +++ b/ckan/tests/model/test_resource.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.model as model diff --git a/ckan/tests/model/test_resource_view.py b/ckan/tests/model/test_resource_view.py index 232f9175c52..28642a0d3ac 100644 --- a/ckan/tests/model/test_resource_view.py +++ b/ckan/tests/model/test_resource_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.model as model diff --git a/ckan/tests/model/test_system_info.py b/ckan/tests/model/test_system_info.py index 63a4b11088f..d5bd5894594 100644 --- a/ckan/tests/model/test_system_info.py +++ b/ckan/tests/model/test_system_info.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.tests.helpers as helpers diff --git a/ckan/tests/model/test_user.py b/ckan/tests/model/test_user.py index d97d90e2673..595c7dc39fe 100644 --- a/ckan/tests/model/test_user.py +++ b/ckan/tests/model/test_user.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os import hashlib import unittest diff --git a/ckan/tests/plugins/__init__.py b/ckan/tests/plugins/__init__.py index 8cdf1c240a1..cbf5c6af72f 100644 --- a/ckan/tests/plugins/__init__.py +++ b/ckan/tests/plugins/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''The plugin interfaces in :mod:`ckan.plugins.interfaces` are not directly testable because they don't contain any code, *but*: diff --git a/ckan/tests/plugins/test_toolkit.py b/ckan/tests/plugins/test_toolkit.py index d5c0d382166..9ed1cee56e4 100644 --- a/ckan/tests/plugins/test_toolkit.py +++ b/ckan/tests/plugins/test_toolkit.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal, assert_raises, assert_true, raises from ckan.plugins import toolkit as tk diff --git a/ckan/tests/test_authz.py b/ckan/tests/test_authz.py index fae0f04d398..5422323a9b6 100644 --- a/ckan/tests/test_authz.py +++ b/ckan/tests/test_authz.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose from ckan import authz as auth diff --git a/ckan/tests/test_coding_standards.py b/ckan/tests/test_coding_standards.py index f49ae9d2840..8726f277bd3 100644 --- a/ckan/tests/test_coding_standards.py +++ b/ckan/tests/test_coding_standards.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''A module for coding standards tests. These are tests that are not functional- or unit-testing any particular piece @@ -6,6 +8,11 @@ etc. ''' + +import io +import os +import os.path +import re import subprocess import ckan.lib.util as util @@ -66,3 +73,54 @@ def test_building_the_docs(): if new_warnings: assert False, ("Don't add any new warnings to the Sphinx build: " "{warnings}".format(warnings=new_warnings)) + + +def test_source_files_specify_encoding(): + ''' + Test that *.py files have a PEP 263 UTF-8 encoding specification. + + Empty files and files that only contain comments are ignored. + ''' + root_dir = os.path.join(os.path.dirname(__file__), '..', '..') + test_dirs = ['ckan', 'ckanext'] + ignored_dirs = ['ckan/include'] + pattern = re.compile(r'#.*?coding[:=][ \t]*utf-?8') + decode_errors = [] + no_specification = [] + + def check_file(filename): + try: + with io.open(filename, encoding='utf-8') as f: + for line in f: + line = line.strip() + if pattern.match(line): + # Pattern found + return + elif line and not line.startswith('#'): + # File contains non-empty non-comment line + no_specification.append(os.path.relpath(filename, + root_dir)) + return + except UnicodeDecodeError: + decode_errors.append(filename) + + for test_dir in test_dirs: + base_dir = os.path.join(root_dir, test_dir) + for root, dirnames, filenames in os.walk(base_dir): + dirnames[:] = [d for d in dirnames if not + os.path.relpath(os.path.join(root, d), root_dir) + in ignored_dirs] + for filename in filenames: + if not filename.endswith('.py'): + continue + check_file(os.path.join(root, filename)) + + msgs = [] + if no_specification: + msgs.append('The following files are missing an encoding ' + + 'specification: {}'.format(no_specification)) + if decode_errors: + msgs.append('The following files are not valid UTF-8: {}'.format( + decode_errors)) + if msgs: + assert False, '\n\n'.join(msgs) diff --git a/ckan/tests/test_factories.py b/ckan/tests/test_factories.py index 85f051c8d04..fe1a0c3f6ac 100644 --- a/ckan/tests/test_factories.py +++ b/ckan/tests/test_factories.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools import ckan.plugins as p diff --git a/ckan/websetup.py b/ckan/websetup.py index db268e9efa8..48365a5f81f 100644 --- a/ckan/websetup.py +++ b/ckan/websetup.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + """Setup the ckan application""" import logging diff --git a/ckanext/__init__.py b/ckanext/__init__.py index 2e2033b3c05..ed48ed012a3 100644 --- a/ckanext/__init__.py +++ b/ckanext/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckanext/datapusher/cli.py b/ckanext/datapusher/cli.py index 7db5bc81711..4edb8939e72 100644 --- a/ckanext/datapusher/cli.py +++ b/ckanext/datapusher/cli.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sys import ckan.lib.cli as cli diff --git a/ckanext/datapusher/helpers.py b/ckanext/datapusher/helpers.py index 535e6d57635..c6dd90833e8 100644 --- a/ckanext/datapusher/helpers.py +++ b/ckanext/datapusher/helpers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins.toolkit as toolkit diff --git a/ckanext/datapusher/interfaces.py b/ckanext/datapusher/interfaces.py index 4ecc01bfdea..08d5a8788f6 100644 --- a/ckanext/datapusher/interfaces.py +++ b/ckanext/datapusher/interfaces.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.plugins.interfaces import Interface diff --git a/ckanext/datapusher/logic/action.py b/ckanext/datapusher/logic/action.py index 5afb4b0b33a..44089dd9656 100644 --- a/ckanext/datapusher/logic/action.py +++ b/ckanext/datapusher/logic/action.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import json import urlparse diff --git a/ckanext/datapusher/logic/auth.py b/ckanext/datapusher/logic/auth.py index 55a7e832488..75c611f3fe2 100644 --- a/ckanext/datapusher/logic/auth.py +++ b/ckanext/datapusher/logic/auth.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckanext.datastore.logic.auth as auth diff --git a/ckanext/datapusher/logic/schema.py b/ckanext/datapusher/logic/schema.py index 14abd7aef45..0fce27b8dde 100644 --- a/ckanext/datapusher/logic/schema.py +++ b/ckanext/datapusher/logic/schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p import ckanext.datastore.logic.schema as dsschema diff --git a/ckanext/datapusher/plugin.py b/ckanext/datapusher/plugin.py index 9da74f44c79..ea9a5fc8bb4 100644 --- a/ckanext/datapusher/plugin.py +++ b/ckanext/datapusher/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import ckan.plugins as p diff --git a/ckanext/datapusher/tests/test.py b/ckanext/datapusher/tests/test.py index 872fdb43c62..2d44c0b14e1 100644 --- a/ckanext/datapusher/tests/test.py +++ b/ckanext/datapusher/tests/test.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import httpretty import httpretty.core diff --git a/ckanext/datapusher/tests/test_action.py b/ckanext/datapusher/tests/test_action.py index 7c24612d9e6..5c74c98e6a4 100644 --- a/ckanext/datapusher/tests/test_action.py +++ b/ckanext/datapusher/tests/test_action.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from nose.tools import eq_ diff --git a/ckanext/datapusher/tests/test_default_views.py b/ckanext/datapusher/tests/test_default_views.py index 6908640e97b..14c33eecdf1 100644 --- a/ckanext/datapusher/tests/test_default_views.py +++ b/ckanext/datapusher/tests/test_default_views.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime import nose diff --git a/ckanext/datapusher/tests/test_interfaces.py b/ckanext/datapusher/tests/test_interfaces.py index dff6ed36ea3..d21bf3ab2b7 100644 --- a/ckanext/datapusher/tests/test_interfaces.py +++ b/ckanext/datapusher/tests/test_interfaces.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import httpretty import nose diff --git a/ckanext/datastore/commands.py b/ckanext/datastore/commands.py index a08565aa184..5aa88f23a23 100644 --- a/ckanext/datastore/commands.py +++ b/ckanext/datastore/commands.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from __future__ import print_function import argparse import os diff --git a/ckanext/datastore/controller.py b/ckanext/datastore/controller.py index 3bb5def4e73..b872c1d3a78 100644 --- a/ckanext/datastore/controller.py +++ b/ckanext/datastore/controller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import StringIO import unicodecsv as csv diff --git a/ckanext/datastore/db.py b/ckanext/datastore/db.py index 5a834f65a5f..4e6b47956db 100644 --- a/ckanext/datastore/db.py +++ b/ckanext/datastore/db.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import datetime import os diff --git a/ckanext/datastore/helpers.py b/ckanext/datastore/helpers.py index 5fde17d7452..1440f79b2ef 100644 --- a/ckanext/datastore/helpers.py +++ b/ckanext/datastore/helpers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import json diff --git a/ckanext/datastore/interfaces.py b/ckanext/datastore/interfaces.py index 48c4abf6bb5..996167b4a6c 100644 --- a/ckanext/datastore/interfaces.py +++ b/ckanext/datastore/interfaces.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins.interfaces as interfaces diff --git a/ckanext/datastore/logic/action.py b/ckanext/datastore/logic/action.py index 048c9a87c80..9869d14baaa 100644 --- a/ckanext/datastore/logic/action.py +++ b/ckanext/datastore/logic/action.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import pylons diff --git a/ckanext/datastore/logic/auth.py b/ckanext/datastore/logic/auth.py index bce4de74254..1c5df6ed590 100644 --- a/ckanext/datastore/logic/auth.py +++ b/ckanext/datastore/logic/auth.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p diff --git a/ckanext/datastore/logic/schema.py b/ckanext/datastore/logic/schema.py index bce1cd54608..e445a8deb6e 100644 --- a/ckanext/datastore/logic/schema.py +++ b/ckanext/datastore/logic/schema.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import ckan.plugins as p diff --git a/ckanext/datastore/plugin.py b/ckanext/datastore/plugin.py index 2175b28ebec..5847b4302af 100644 --- a/ckanext/datastore/plugin.py +++ b/ckanext/datastore/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sys import logging import re diff --git a/ckanext/datastore/tests/helpers.py b/ckanext/datastore/tests/helpers.py index 3ee89cdda20..7e707a0e75e 100644 --- a/ckanext/datastore/tests/helpers.py +++ b/ckanext/datastore/tests/helpers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.model as model import ckan.lib.cli as cli diff --git a/ckanext/datastore/tests/sample_datastore_plugin.py b/ckanext/datastore/tests/sample_datastore_plugin.py index 488bbc9ae5e..003738d44cb 100644 --- a/ckanext/datastore/tests/sample_datastore_plugin.py +++ b/ckanext/datastore/tests/sample_datastore_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p import ckanext.datastore.interfaces as interfaces diff --git a/ckanext/datastore/tests/test_configure.py b/ckanext/datastore/tests/test_configure.py index 818639a3f41..9ecd0432802 100644 --- a/ckanext/datastore/tests/test_configure.py +++ b/ckanext/datastore/tests/test_configure.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import unittest import nose.tools import pyutilib.component.core diff --git a/ckanext/datastore/tests/test_create.py b/ckanext/datastore/tests/test_create.py index 347ec319b5d..a36340ec82d 100644 --- a/ckanext/datastore/tests/test_create.py +++ b/ckanext/datastore/tests/test_create.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import nose import sys diff --git a/ckanext/datastore/tests/test_db.py b/ckanext/datastore/tests/test_db.py index 643ba8d1f32..0d0d1930dd4 100644 --- a/ckanext/datastore/tests/test_db.py +++ b/ckanext/datastore/tests/test_db.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import mock import nose diff --git a/ckanext/datastore/tests/test_delete.py b/ckanext/datastore/tests/test_delete.py index e84584ad491..f0af7b861e9 100644 --- a/ckanext/datastore/tests/test_delete.py +++ b/ckanext/datastore/tests/test_delete.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import nose diff --git a/ckanext/datastore/tests/test_disable.py b/ckanext/datastore/tests/test_disable.py index e47cfe4fc1c..dbe925d5971 100644 --- a/ckanext/datastore/tests/test_disable.py +++ b/ckanext/datastore/tests/test_disable.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose import pylons.config as config diff --git a/ckanext/datastore/tests/test_dump.py b/ckanext/datastore/tests/test_dump.py index 53190240bb6..15e4b447238 100644 --- a/ckanext/datastore/tests/test_dump.py +++ b/ckanext/datastore/tests/test_dump.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import nose diff --git a/ckanext/datastore/tests/test_helpers.py b/ckanext/datastore/tests/test_helpers.py index f4d6521e7f6..6a3e121bdad 100644 --- a/ckanext/datastore/tests/test_helpers.py +++ b/ckanext/datastore/tests/test_helpers.py @@ -1,4 +1,4 @@ -# -*- encoding: utf-8 -*- +# encoding: utf-8 import pylons import sqlalchemy.orm as orm diff --git a/ckanext/datastore/tests/test_info.py b/ckanext/datastore/tests/test_info.py index 88f0efb5803..d1fc84e20e7 100644 --- a/ckanext/datastore/tests/test_info.py +++ b/ckanext/datastore/tests/test_info.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import nose import pprint diff --git a/ckanext/datastore/tests/test_interface.py b/ckanext/datastore/tests/test_interface.py index ef92ac45463..cff0f070db7 100644 --- a/ckanext/datastore/tests/test_interface.py +++ b/ckanext/datastore/tests/test_interface.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose import ckan.plugins as p diff --git a/ckanext/datastore/tests/test_plugin.py b/ckanext/datastore/tests/test_plugin.py index 27efa960440..843c829701c 100644 --- a/ckanext/datastore/tests/test_plugin.py +++ b/ckanext/datastore/tests/test_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose import mock diff --git a/ckanext/datastore/tests/test_search.py b/ckanext/datastore/tests/test_search.py index 95b3039c13d..1ef119c320c 100644 --- a/ckanext/datastore/tests/test_search.py +++ b/ckanext/datastore/tests/test_search.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import json import nose import pprint diff --git a/ckanext/datastore/tests/test_unit.py b/ckanext/datastore/tests/test_unit.py index f9caaa2ecf3..653fc9699f1 100644 --- a/ckanext/datastore/tests/test_unit.py +++ b/ckanext/datastore/tests/test_unit.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import unittest import pylons import nose diff --git a/ckanext/datastore/tests/test_upsert.py b/ckanext/datastore/tests/test_upsert.py index 402953501a3..22fedccab35 100644 --- a/ckanext/datastore/tests/test_upsert.py +++ b/ckanext/datastore/tests/test_upsert.py @@ -1,4 +1,5 @@ -# -*- coding: utf-8 -*- +# encoding: utf-8 + import json import nose import datetime diff --git a/ckanext/example_iauthfunctions/plugin_v1.py b/ckanext/example_iauthfunctions/plugin_v1.py index 19637581020..11218f4a5e5 100644 --- a/ckanext/example_iauthfunctions/plugin_v1.py +++ b/ckanext/example_iauthfunctions/plugin_v1.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins diff --git a/ckanext/example_iauthfunctions/plugin_v2.py b/ckanext/example_iauthfunctions/plugin_v2.py index 71cb68e4d5a..d97f215675e 100644 --- a/ckanext/example_iauthfunctions/plugin_v2.py +++ b/ckanext/example_iauthfunctions/plugin_v2.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins diff --git a/ckanext/example_iauthfunctions/plugin_v3.py b/ckanext/example_iauthfunctions/plugin_v3.py index af14b87bc0d..7eb57b833e2 100644 --- a/ckanext/example_iauthfunctions/plugin_v3.py +++ b/ckanext/example_iauthfunctions/plugin_v3.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_iauthfunctions/plugin_v4.py b/ckanext/example_iauthfunctions/plugin_v4.py index 5bf972b07d0..ea8a0b6b979 100644 --- a/ckanext/example_iauthfunctions/plugin_v4.py +++ b/ckanext/example_iauthfunctions/plugin_v4.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py b/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py index 44d43cf9d3d..f32cba56dbc 100644 --- a/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py +++ b/ckanext/example_iauthfunctions/plugin_v5_custom_config_setting.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import pylons.config as config import ckan.plugins as plugins diff --git a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py index d63ae60d474..517fdac8764 100644 --- a/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py +++ b/ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Tests for the ckanext.example_iauthfunctions extension. ''' diff --git a/ckanext/example_iconfigurer/controller.py b/ckanext/example_iconfigurer/controller.py index f73261dcada..8dc8720b3b7 100644 --- a/ckanext/example_iconfigurer/controller.py +++ b/ckanext/example_iconfigurer/controller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.lib.base as base import ckan.lib.helpers as helpers diff --git a/ckanext/example_iconfigurer/plugin.py b/ckanext/example_iconfigurer/plugin.py index 0974f3eace0..8f0b8fa5eb2 100644 --- a/ckanext/example_iconfigurer/plugin.py +++ b/ckanext/example_iconfigurer/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from routes.mapper import SubMapper import ckan.plugins as plugins diff --git a/ckanext/example_iconfigurer/plugin_v1.py b/ckanext/example_iconfigurer/plugin_v1.py index 3f454b6d6c3..79ff7865fcd 100644 --- a/ckanext/example_iconfigurer/plugin_v1.py +++ b/ckanext/example_iconfigurer/plugin_v1.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_iconfigurer/plugin_v2.py b/ckanext/example_iconfigurer/plugin_v2.py index 7fb839fa076..5b6736f9402 100644 --- a/ckanext/example_iconfigurer/plugin_v2.py +++ b/ckanext/example_iconfigurer/plugin_v2.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py b/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py index 7090cb5eef4..f001ac2ec55 100644 --- a/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py +++ b/ckanext/example_iconfigurer/tests/test_example_iconfigurer.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose import tools as nosetools import ckan.tests.helpers as helpers diff --git a/ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py b/ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py index 2870d413011..71af30a9a38 100644 --- a/ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py +++ b/ckanext/example_iconfigurer/tests/test_iconfigurer_toolkit.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose import tools as nosetools import ckan.tests.helpers as helpers diff --git a/ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py b/ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py index 49ba5546c64..f5f44b957f9 100644 --- a/ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py +++ b/ckanext/example_iconfigurer/tests/test_iconfigurer_update_config.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools from pylons import config diff --git a/ckanext/example_idatasetform/plugin.py b/ckanext/example_idatasetform/plugin.py index 12542a3f252..1e95bc74544 100644 --- a/ckanext/example_idatasetform/plugin.py +++ b/ckanext/example_idatasetform/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import ckan.plugins as plugins diff --git a/ckanext/example_idatasetform/plugin_v1.py b/ckanext/example_idatasetform/plugin_v1.py index 183e12ff28e..d01d53bd788 100644 --- a/ckanext/example_idatasetform/plugin_v1.py +++ b/ckanext/example_idatasetform/plugin_v1.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p import ckan.plugins.toolkit as tk diff --git a/ckanext/example_idatasetform/plugin_v2.py b/ckanext/example_idatasetform/plugin_v2.py index 9741d8be7ff..ffc8fa89fe6 100644 --- a/ckanext/example_idatasetform/plugin_v2.py +++ b/ckanext/example_idatasetform/plugin_v2.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p import ckan.plugins.toolkit as tk diff --git a/ckanext/example_idatasetform/plugin_v3.py b/ckanext/example_idatasetform/plugin_v3.py index a80d26a46db..49914f809e8 100644 --- a/ckanext/example_idatasetform/plugin_v3.py +++ b/ckanext/example_idatasetform/plugin_v3.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Example IDatasetFormPlugin''' import ckan.plugins as p import ckan.plugins.toolkit as tk diff --git a/ckanext/example_idatasetform/plugin_v4.py b/ckanext/example_idatasetform/plugin_v4.py index 01f6ce5c430..69286854c6b 100644 --- a/ckanext/example_idatasetform/plugin_v4.py +++ b/ckanext/example_idatasetform/plugin_v4.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p import ckan.plugins.toolkit as tk diff --git a/ckanext/example_idatasetform/tests/test_controllers.py b/ckanext/example_idatasetform/tests/test_controllers.py index dfeda2163f6..102533f96e3 100644 --- a/ckanext/example_idatasetform/tests/test_controllers.py +++ b/ckanext/example_idatasetform/tests/test_controllers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from routes import url_for diff --git a/ckanext/example_idatasetform/tests/test_example_idatasetform.py b/ckanext/example_idatasetform/tests/test_example_idatasetform.py index 99f5c79f94c..5952ba0f54d 100644 --- a/ckanext/example_idatasetform/tests/test_example_idatasetform.py +++ b/ckanext/example_idatasetform/tests/test_example_idatasetform.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import nose.tools as nt import pylons.config as config diff --git a/ckanext/example_igroupform/plugin.py b/ckanext/example_igroupform/plugin.py index 5c1e76ee451..ef973b4ddce 100644 --- a/ckanext/example_igroupform/plugin.py +++ b/ckanext/example_igroupform/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as tk diff --git a/ckanext/example_igroupform/tests/test_controllers.py b/ckanext/example_igroupform/tests/test_controllers.py index 1a930348fd6..b6f03eaf7e6 100644 --- a/ckanext/example_igroupform/tests/test_controllers.py +++ b/ckanext/example_igroupform/tests/test_controllers.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equal from routes import url_for diff --git a/ckanext/example_iresourcecontroller/plugin.py b/ckanext/example_iresourcecontroller/plugin.py index 1330f23887b..a1ca22a611b 100644 --- a/ckanext/example_iresourcecontroller/plugin.py +++ b/ckanext/example_iresourcecontroller/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from collections import defaultdict import ckan.plugins as plugins diff --git a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py index 5d5070a7709..3481ded4e40 100644 --- a/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py +++ b/ckanext/example_iresourcecontroller/tests/test_example_iresourcecontroller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''Tests for the ckanext.example_iauthfunctions extension. ''' diff --git a/ckanext/example_itemplatehelpers/plugin.py b/ckanext/example_itemplatehelpers/plugin.py index 5c7d6bcbf12..2824d9d649b 100644 --- a/ckanext/example_itemplatehelpers/plugin.py +++ b/ckanext/example_itemplatehelpers/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins # Our custom template helper function. diff --git a/ckanext/example_itranslation/plugin.py b/ckanext/example_itranslation/plugin.py index c893ca1feef..fa79959826f 100644 --- a/ckanext/example_itranslation/plugin.py +++ b/ckanext/example_itranslation/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan import plugins from ckan.plugins import toolkit from ckan.lib.plugins import DefaultTranslation diff --git a/ckanext/example_itranslation/plugin_v1.py b/ckanext/example_itranslation/plugin_v1.py index 8ec304b0804..09b451b6612 100644 --- a/ckanext/example_itranslation/plugin_v1.py +++ b/ckanext/example_itranslation/plugin_v1.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan import plugins from ckan.plugins import toolkit diff --git a/ckanext/example_itranslation/tests/test_plugin.py b/ckanext/example_itranslation/tests/test_plugin.py index 9e25b6f8c2c..cd794434aaa 100644 --- a/ckanext/example_itranslation/tests/test_plugin.py +++ b/ckanext/example_itranslation/tests/test_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan import plugins from ckan.tests import helpers diff --git a/ckanext/example_iuploader/plugin.py b/ckanext/example_iuploader/plugin.py index f50dd878305..800755e64fb 100644 --- a/ckanext/example_iuploader/plugin.py +++ b/ckanext/example_iuploader/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from ckan import plugins diff --git a/ckanext/example_iuploader/test/test_plugin.py b/ckanext/example_iuploader/test/test_plugin.py index d843155a019..f99dc6b15f9 100644 --- a/ckanext/example_iuploader/test/test_plugin.py +++ b/ckanext/example_iuploader/test/test_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import __builtin__ as builtins import paste.fileapp diff --git a/ckanext/example_ivalidators/plugin.py b/ckanext/example_ivalidators/plugin.py index 928658fae91..7d559b5c2ef 100644 --- a/ckanext/example_ivalidators/plugin.py +++ b/ckanext/example_ivalidators/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from ckan.plugins.toolkit import Invalid from ckan import plugins diff --git a/ckanext/example_ivalidators/tests/test_ivalidators.py b/ckanext/example_ivalidators/tests/test_ivalidators.py index ade9c0954e5..47f64103da6 100644 --- a/ckanext/example_ivalidators/tests/test_ivalidators.py +++ b/ckanext/example_ivalidators/tests/test_ivalidators.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from nose.tools import assert_equals, assert_raises import pylons.config as config diff --git a/ckanext/example_theme/custom_config_setting/plugin.py b/ckanext/example_theme/custom_config_setting/plugin.py index 6985a5e64e9..74439633949 100644 --- a/ckanext/example_theme/custom_config_setting/plugin.py +++ b/ckanext/example_theme/custom_config_setting/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import pylons.config as config import ckan.plugins as plugins diff --git a/ckanext/example_theme/custom_emails/plugin.py b/ckanext/example_theme/custom_emails/plugin.py index f5a28933e86..8c2cf485604 100644 --- a/ckanext/example_theme/custom_emails/plugin.py +++ b/ckanext/example_theme/custom_emails/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_theme/custom_emails/tests.py b/ckanext/example_theme/custom_emails/tests.py index 137932d7770..3aaf30e40f4 100644 --- a/ckanext/example_theme/custom_emails/tests.py +++ b/ckanext/example_theme/custom_emails/tests.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from pylons import config from ckan import plugins diff --git a/ckanext/example_theme/v01_empty_extension/plugin.py b/ckanext/example_theme/v01_empty_extension/plugin.py index 43686f7e315..7a85f4dcb2f 100644 --- a/ckanext/example_theme/v01_empty_extension/plugin.py +++ b/ckanext/example_theme/v01_empty_extension/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins diff --git a/ckanext/example_theme/v02_empty_template/plugin.py b/ckanext/example_theme/v02_empty_template/plugin.py index 4484b6a0fe8..017b119241e 100644 --- a/ckanext/example_theme/v02_empty_template/plugin.py +++ b/ckanext/example_theme/v02_empty_template/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + '''plugin.py ''' diff --git a/ckanext/example_theme/v08_custom_helper_function/plugin.py b/ckanext/example_theme/v08_custom_helper_function/plugin.py index 3dd3008a941..e9bb9e10ab1 100644 --- a/ckanext/example_theme/v08_custom_helper_function/plugin.py +++ b/ckanext/example_theme/v08_custom_helper_function/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_theme/v12_extra_public_dir/plugin.py b/ckanext/example_theme/v12_extra_public_dir/plugin.py index 4bb3e36d4dc..ec3ef074a1e 100644 --- a/ckanext/example_theme/v12_extra_public_dir/plugin.py +++ b/ckanext/example_theme/v12_extra_public_dir/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_theme/v15_fanstatic/plugin.py b/ckanext/example_theme/v15_fanstatic/plugin.py index f1a82d96ac1..e952bcb47c9 100644 --- a/ckanext/example_theme/v15_fanstatic/plugin.py +++ b/ckanext/example_theme/v15_fanstatic/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py b/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py index 803fb73181a..3bce68bc31c 100644 --- a/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py +++ b/ckanext/example_theme/v16_initialize_a_javascript_module/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit diff --git a/ckanext/imageview/plugin.py b/ckanext/imageview/plugin.py index 75110d376df..329b88b4126 100644 --- a/ckanext/imageview/plugin.py +++ b/ckanext/imageview/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import ckan.plugins as p diff --git a/ckanext/imageview/tests/test_view.py b/ckanext/imageview/tests/test_view.py index f105aea611b..4a742747ed7 100644 --- a/ckanext/imageview/tests/test_view.py +++ b/ckanext/imageview/tests/test_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from routes import url_for import ckan.plugins as p diff --git a/ckanext/multilingual/plugin.py b/ckanext/multilingual/plugin.py index 071f78f684c..5c99321d793 100644 --- a/ckanext/multilingual/plugin.py +++ b/ckanext/multilingual/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan from ckan.plugins import SingletonPlugin, implements, IPackageController from ckan.plugins import IGroupController, IOrganizationController, ITagController, IResourceController diff --git a/ckanext/multilingual/tests/test_multilingual_plugin.py b/ckanext/multilingual/tests/test_multilingual_plugin.py index 118ad195470..03bb73558f9 100644 --- a/ckanext/multilingual/tests/test_multilingual_plugin.py +++ b/ckanext/multilingual/tests/test_multilingual_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins import ckanext.multilingual.plugin as mulilingual_plugin import ckan.lib.helpers diff --git a/ckanext/reclineview/plugin.py b/ckanext/reclineview/plugin.py index a0979740ec0..2a22a884347 100644 --- a/ckanext/reclineview/plugin.py +++ b/ckanext/reclineview/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from logging import getLogger from ckan.common import json diff --git a/ckanext/reclineview/tests/test_view.py b/ckanext/reclineview/tests/test_view.py index f726d81ab8d..897be8048f2 100644 --- a/ckanext/reclineview/tests/test_view.py +++ b/ckanext/reclineview/tests/test_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import paste.fixture import pylons.config as config diff --git a/ckanext/resourceproxy/controller.py b/ckanext/resourceproxy/controller.py index 2a1fd008c1d..7d911187f8d 100644 --- a/ckanext/resourceproxy/controller.py +++ b/ckanext/resourceproxy/controller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from logging import getLogger import urlparse diff --git a/ckanext/resourceproxy/plugin.py b/ckanext/resourceproxy/plugin.py index 0aaab50a5c6..4cd1b5edd82 100644 --- a/ckanext/resourceproxy/plugin.py +++ b/ckanext/resourceproxy/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from logging import getLogger import ckan.lib.helpers as h diff --git a/ckanext/resourceproxy/tests/test_proxy.py b/ckanext/resourceproxy/tests/test_proxy.py index de15c7eccd3..28a382ef713 100644 --- a/ckanext/resourceproxy/tests/test_proxy.py +++ b/ckanext/resourceproxy/tests/test_proxy.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import sys import requests import unittest diff --git a/ckanext/stats/__init__.py b/ckanext/stats/__init__.py index de40ea7ca05..2f1b2e4d2b0 100644 --- a/ckanext/stats/__init__.py +++ b/ckanext/stats/__init__.py @@ -1 +1,3 @@ +# encoding: utf-8 + __import__('pkg_resources').declare_namespace(__name__) diff --git a/ckanext/stats/controller.py b/ckanext/stats/controller.py index 7c24c385a93..de5b9c2d39a 100644 --- a/ckanext/stats/controller.py +++ b/ckanext/stats/controller.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import ckan.plugins as p from ckan.lib.base import BaseController import stats as stats_lib diff --git a/ckanext/stats/plugin.py b/ckanext/stats/plugin.py index 11caf7a42d4..a7d46f086f9 100644 --- a/ckanext/stats/plugin.py +++ b/ckanext/stats/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from logging import getLogger import ckan.plugins as p diff --git a/ckanext/stats/public/__init__.py b/ckanext/stats/public/__init__.py index 2e2033b3c05..ed48ed012a3 100644 --- a/ckanext/stats/public/__init__.py +++ b/ckanext/stats/public/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckanext/stats/public/ckanext/__init__.py b/ckanext/stats/public/ckanext/__init__.py index 2e2033b3c05..ed48ed012a3 100644 --- a/ckanext/stats/public/ckanext/__init__.py +++ b/ckanext/stats/public/ckanext/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckanext/stats/public/ckanext/stats/__init__.py b/ckanext/stats/public/ckanext/stats/__init__.py index 2e2033b3c05..ed48ed012a3 100644 --- a/ckanext/stats/public/ckanext/stats/__init__.py +++ b/ckanext/stats/public/ckanext/stats/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # this is a namespace package try: import pkg_resources diff --git a/ckanext/stats/stats.py b/ckanext/stats/stats.py index a69de08b09b..657cd2ba1f4 100644 --- a/ckanext/stats/stats.py +++ b/ckanext/stats/stats.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from pylons import config diff --git a/ckanext/stats/tests/__init__.py b/ckanext/stats/tests/__init__.py index b061f836d7c..2530688d211 100644 --- a/ckanext/stats/tests/__init__.py +++ b/ckanext/stats/tests/__init__.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import paste.fixture from pylons import config from ckan.config.middleware import make_app diff --git a/ckanext/stats/tests/test_stats_lib.py b/ckanext/stats/tests/test_stats_lib.py index daa3fd0a50d..e927afa4ae9 100644 --- a/ckanext/stats/tests/test_stats_lib.py +++ b/ckanext/stats/tests/test_stats_lib.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import datetime from nose.tools import assert_equal diff --git a/ckanext/stats/tests/test_stats_plugin.py b/ckanext/stats/tests/test_stats_plugin.py index f6671632f4a..b87af1e4625 100644 --- a/ckanext/stats/tests/test_stats_plugin.py +++ b/ckanext/stats/tests/test_stats_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import os from ckan.tests.legacy import url_for diff --git a/ckanext/test_tag_vocab_plugin.py b/ckanext/test_tag_vocab_plugin.py index 248f797d47c..70774808797 100644 --- a/ckanext/test_tag_vocab_plugin.py +++ b/ckanext/test_tag_vocab_plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + ''' THIS PLUGIN IS FOR TESTING PURPOSES ONLY. Currently this is used in tests/functional/test_tag_vocab.py''' diff --git a/ckanext/textview/plugin.py b/ckanext/textview/plugin.py index 03806af017f..19e3bb1b3b5 100644 --- a/ckanext/textview/plugin.py +++ b/ckanext/textview/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging from ckan.common import json diff --git a/ckanext/textview/tests/test_view.py b/ckanext/textview/tests/test_view.py index 06f9c90d1dc..1e6f9144cbe 100644 --- a/ckanext/textview/tests/test_view.py +++ b/ckanext/textview/tests/test_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import paste.fixture import pylons.config as config import urlparse diff --git a/ckanext/webpageview/plugin.py b/ckanext/webpageview/plugin.py index 044870b7c05..abfc26dec00 100644 --- a/ckanext/webpageview/plugin.py +++ b/ckanext/webpageview/plugin.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + import logging import ckan.plugins as p diff --git a/ckanext/webpageview/tests/test_view.py b/ckanext/webpageview/tests/test_view.py index 9f6c152b025..9b6e03d64d6 100644 --- a/ckanext/webpageview/tests/test_view.py +++ b/ckanext/webpageview/tests/test_view.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + from routes import url_for import ckan.plugins as p diff --git a/profile_tests.py b/profile_tests.py index 463fc620675..71862b19f8d 100644 --- a/profile_tests.py +++ b/profile_tests.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # Runs all the tests and save a speed profile to ckan.tests.profile import nose import cProfile diff --git a/setup.py b/setup.py index 7e24a7d4a3a..dce5ee6ddec 100644 --- a/setup.py +++ b/setup.py @@ -1,3 +1,5 @@ +# encoding: utf-8 + # Avoid problem releasing to pypi from vagrant import os if os.environ.get('USER', '') == 'vagrant':