From 4733b00256b409c74c1bfb124eb4df4684c20e34 Mon Sep 17 00:00:00 2001 From: Jari Voutilainen Date: Thu, 22 Aug 2019 14:49:53 +0300 Subject: [PATCH] flake8 --- ckanext/rating/commands.py | 4 ++-- ckanext/rating/controller.py | 1 + ckanext/rating/model.py | 2 +- ckanext/rating/plugin.py | 15 ++++++++------- ckanext/rating/tests/test_plugin.py | 4 ++-- 5 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ckanext/rating/commands.py b/ckanext/rating/commands.py index 3280cca..473da88 100644 --- a/ckanext/rating/commands.py +++ b/ckanext/rating/commands.py @@ -1,5 +1,6 @@ from ckan.lib.cli import CkanCommand + class RatingCommand(CkanCommand): ''' Send notification emails of datasets which have a reminder date set @@ -31,8 +32,7 @@ class RatingCommand(CkanCommand): else: self.log.error('Command "%s" not recognized' % (cmd,)) - def init_db(self): import ckan.model as model from ckanext.rating.model import init_tables - init_tables(model.meta.engine) \ No newline at end of file + init_tables(model.meta.engine) diff --git a/ckanext/rating/controller.py b/ckanext/rating/controller.py index 7743445..2d66dea 100644 --- a/ckanext/rating/controller.py +++ b/ckanext/rating/controller.py @@ -11,6 +11,7 @@ flatten_to_string_key = logic.flatten_to_string_key NotAuthorized = logic.NotAuthorized abort = base.abort + class RatingController(p.toolkit.BaseController): def submit_package_rating(self, package, rating): diff --git a/ckanext/rating/model.py b/ckanext/rating/model.py index 3c22133..d4f7ff1 100644 --- a/ckanext/rating/model.py +++ b/ckanext/rating/model.py @@ -29,7 +29,7 @@ class Rating(Base): package_id = Column(types.UnicodeText, nullable=True, index=True) rating = Column(types.Float, nullable=False) user_id = Column(types.UnicodeText, nullable=True, index=True) - rater_ip = Column(types.UnicodeText) # Used for identification if user is not authenticated + rater_ip = Column(types.UnicodeText) # Used for identification if user is not authenticated created = Column(types.DateTime, default=datetime.datetime.now) updated = Column(types.DateTime, default=datetime.datetime.now) diff --git a/ckanext/rating/plugin.py b/ckanext/rating/plugin.py index aeeb25a..0a76e07 100644 --- a/ckanext/rating/plugin.py +++ b/ckanext/rating/plugin.py @@ -1,6 +1,6 @@ import ckan.plugins as plugins import ckan.plugins.toolkit as toolkit -from ckan.common import request, c, g +from ckan.common import c, g import sqlalchemy import ckan.model as model @@ -27,7 +27,9 @@ def sort_by_rating(sort): c.count_pkg = model.Session.query( sqlalchemy.func.count(model.Package.id)).\ filter(model.Package.type == 'dataset').\ - filter(model.Package.private == False).\ + filter( + model.Package.private == False # noqa E712 + ).\ filter(model.Package.state == 'active').scalar() query = model.Session.query( model.Package.id, model.Package.title, @@ -36,7 +38,9 @@ def sort_by_rating(sort): label('rating_avg')).\ outerjoin(Rating, Rating.package_id == model.Package.id).\ filter(model.Package.type == 'dataset').\ - filter(model.Package.private == False).\ + filter( + model.Package.private == False # noqa E712 + ).\ filter(model.Package.state == 'active').\ group_by(model.Package.id).\ distinct() @@ -99,7 +103,7 @@ class RatingPlugin(plugins.SingletonPlugin, DefaultTranslation): # IPackageController def before_index(self, data_dict): - rating_dict = action.rating_package_get(None, { 'package_id': data_dict['id'] }) + rating_dict = action.rating_package_get(None, {'package_id': data_dict['id']}) data_dict['rating'] = rating_dict.get('rating') return data_dict @@ -111,7 +115,6 @@ class RatingPlugin(plugins.SingletonPlugin, DefaultTranslation): pkg_dict['ratings_count'] = rating_dict.get('ratings_count', 0) return pkg_dict - def after_search(self, search_results, search_params): for pkg in search_results['results']: @@ -140,5 +143,3 @@ class RatingPlugin(plugins.SingletonPlugin, DefaultTranslation): ) return map - - diff --git a/ckanext/rating/tests/test_plugin.py b/ckanext/rating/tests/test_plugin.py index 909d215..f1103d0 100644 --- a/ckanext/rating/tests/test_plugin.py +++ b/ckanext/rating/tests/test_plugin.py @@ -1,5 +1,5 @@ """Tests for plugin.py.""" -import ckanext.rating.plugin as plugin + def test_plugin(): - pass \ No newline at end of file + pass