From aa4e54819d61dcf3a84220478694e859d4cd1a8f Mon Sep 17 00:00:00 2001 From: David Brown Date: Wed, 18 Dec 2019 14:00:13 -0800 Subject: [PATCH] Update Pylint 2.0+ (#266) This updates Pylint to 2.0+ and fixes all the associated code with that gets affected. Signed-off-by: David Brown --- .pre-commit-config.yaml | 4 +-- pacifica/metadata/client.py | 34 ++++++++----------- pacifica/metadata/config.py | 5 +-- pacifica/metadata/orm/atool_project.py | 2 +- pacifica/metadata/orm/atool_transaction.py | 2 +- pacifica/metadata/orm/base.py | 2 +- pacifica/metadata/orm/citation_contributor.py | 2 +- pacifica/metadata/orm/citation_doi.py | 2 +- pacifica/metadata/orm/citation_keyword.py | 2 +- pacifica/metadata/orm/citation_project.py | 2 +- pacifica/metadata/orm/citation_transaction.py | 2 +- pacifica/metadata/orm/dataset_file.py | 2 +- pacifica/metadata/orm/dataset_project_user.py | 2 +- pacifica/metadata/orm/doi_author_mapping.py | 2 +- pacifica/metadata/orm/doi_info.py | 2 +- pacifica/metadata/orm/file_key_value.py | 2 +- pacifica/metadata/orm/institution_user.py | 2 +- .../metadata/orm/instrument_data_source.py | 2 +- pacifica/metadata/orm/instrument_group.py | 2 +- pacifica/metadata/orm/instrument_key_value.py | 2 +- pacifica/metadata/orm/instrument_user.py | 2 +- pacifica/metadata/orm/project_group.py | 2 +- pacifica/metadata/orm/project_instrument.py | 2 +- pacifica/metadata/orm/project_user.py | 2 +- pacifica/metadata/orm/sync.py | 4 +-- .../orm/sync_updates/update_0_1_to_1_0.py | 8 ++--- .../orm/sync_updates/update_2_1_to_3_0.py | 6 ++-- .../orm/sync_updates/update_6_0_to_7_0.py | 2 +- pacifica/metadata/orm/trans_key_value.py | 2 +- pacifica/metadata/orm/transaction_user.py | 2 +- pacifica/metadata/orm/user_group.py | 2 +- pacifica/metadata/orm/utils.py | 8 ++--- .../rest/doi_queries/doi_registration_base.py | 2 +- pacifica/metadata/rest/doiupload.py | 2 +- pacifica/metadata/rest/fileinfo.py | 2 +- .../rest/fileinfo_queries/file_details.py | 2 +- .../rest/fileinfo_queries/files_with_tkv.py | 7 ++-- pacifica/metadata/rest/ingest.py | 2 +- .../instrument_queries/instrument_lookup.py | 17 +++++----- .../rest/instrument_queries/query_base.py | 2 +- pacifica/metadata/rest/instrumentinfo.py | 2 +- .../migration_queries/migrate_instruments.py | 2 +- .../migration_queries/migrate_projects.py | 2 +- .../rest/migration_queries/migrate_users.py | 2 +- pacifica/metadata/rest/migrationinfo.py | 2 +- pacifica/metadata/rest/objectinfo.py | 5 ++- .../rest/project_queries/project_lookup.py | 17 +++++----- .../project_queries/project_term_search.py | 9 +++-- .../rest/project_queries/query_base.py | 11 +++--- pacifica/metadata/rest/projectinfo.py | 2 +- .../rest/reporting_queries/query_base.py | 2 +- pacifica/metadata/rest/root.py | 2 +- pacifica/metadata/rest/summaryinfo.py | 2 +- pacifica/metadata/rest/tkvinfo.py | 2 +- .../tkvinfo_queries/kvs_for_transaction.py | 2 +- .../rest/tkvinfo_queries/values_for_key.py | 7 ++-- pacifica/metadata/rest/tkvupload.py | 2 +- .../rest/tkvupload_queries/upload_entries.py | 2 +- .../rest/transaction_queries/file_lookup.py | 17 +++++----- .../rest/transaction_queries/query_base.py | 4 +-- .../transaction_queries/transaction_lookup.py | 17 +++++----- .../transaction_queries/transaction_search.py | 5 ++- pacifica/metadata/rest/transactioninfo.py | 2 +- .../metadata/rest/user_queries/query_base.py | 2 +- .../metadata/rest/user_queries/user_lookup.py | 11 +++--- .../metadata/rest/user_queries/user_search.py | 11 +++--- pacifica/metadata/rest/userinfo.py | 2 +- requirements-dev.txt | 6 ++-- tests/cherrypy_catch_test.py | 2 +- tests/core/cmd_test.py | 4 +-- tests/orm/base_test.py | 1 - 71 files changed, 144 insertions(+), 170 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 33d28401..0955fe1f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,7 +4,7 @@ repos: hooks: - id: autopep8 - repo: git://github.com/pre-commit/pre-commit-hooks - rev: v2.2.3 + rev: v2.4.0 hooks: - id: fix-encoding-pragma - id: trailing-whitespace @@ -49,7 +49,7 @@ repos: language: system types: [python] - repo: git://github.com/Lucas-C/pre-commit-hooks - rev: v1.1.6 + rev: v1.1.7 hooks: - id: remove-tabs - id: remove-crlf diff --git a/pacifica/metadata/client.py b/pacifica/metadata/client.py index fa27702f..a4aaec33 100644 --- a/pacifica/metadata/client.py +++ b/pacifica/metadata/client.py @@ -8,10 +8,8 @@ class PMClientError(Exception): """Base Exception Error Class.""" - pass - -class PMClient(object): +class PMClient: """ Pacifica Metadata Client. @@ -30,12 +28,11 @@ def create(self, cls_type, set_hash): data=dumps(set_hash), headers=self.headers) if int(ret.status_code / 100) == 2: return True - elif int(ret.status_code / 100) == 5: + if int(ret.status_code / 100) == 5: raise PMClientError('Internal Server Error ({0}) {1}'.format( ret.status_code, ret.content)) - else: - raise PMClientError('Unknown Error ({0}) {1}'.format( - ret.status_code, ret.content)) + raise PMClientError('Unknown Error ({0}) {1}'.format( + ret.status_code, ret.content)) def update(self, cls_type, query_hash, set_hash): """ @@ -52,12 +49,11 @@ def update(self, cls_type, query_hash, set_hash): return True if int(ret.status_code / 100) == 4: return False - elif int(ret.status_code / 100) == 5: + if int(ret.status_code / 100) == 5: raise PMClientError('Internal Server Error ({0}) {1}'.format( ret.status_code, ret.content)) - else: - raise PMClientError('Unknown Error ({0}) {1}'.format( - ret.status_code, ret.content)) + raise PMClientError('Unknown Error ({0}) {1}'.format( + ret.status_code, ret.content)) def get(self, cls_type, query_hash): """Get the object of type from query_hash.""" @@ -65,14 +61,13 @@ def get(self, cls_type, query_hash): params=query_hash, allow_redirects=True) if int(ret.status_code / 100) == 2: return loads(ret.content.decode('UTF-8')) - elif int(ret.status_code / 100) == 4: + if int(ret.status_code / 100) == 4: return {} - elif int(ret.status_code / 100) == 5: + if int(ret.status_code / 100) == 5: raise PMClientError('Internal Server Error ({0}) {1}'.format( ret.status_code, ret.content)) - else: - raise PMClientError('Unknown Error ({0}) {1}'.format( - ret.status_code, ret.content)) + raise PMClientError('Unknown Error ({0}) {1}'.format( + ret.status_code, ret.content)) def delete(self, cls_type, query_hash): """Delete the object of type from query_hash.""" @@ -80,9 +75,8 @@ def delete(self, cls_type, query_hash): '{0}/{1}'.format(self.url, cls_type), params=query_hash, allow_redirects=True) if int(ret.status_code / 100) == 2 or int(ret.status_code / 100) == 4: return True - elif int(ret.status_code / 100) == 5: + if int(ret.status_code / 100) == 5: raise PMClientError('Internal Server Error ({0}) {1}'.format( ret.status_code, ret.content)) - else: - raise PMClientError('Unknown Error ({0}) {1}'.format( - ret.status_code, ret.content)) + raise PMClientError('Unknown Error ({0}) {1}'.format( + ret.status_code, ret.content)) diff --git a/pacifica/metadata/config.py b/pacifica/metadata/config.py index c202a573..26198f92 100644 --- a/pacifica/metadata/config.py +++ b/pacifica/metadata/config.py @@ -3,10 +3,7 @@ """Configuration reading and validation module.""" import logging from os import getenv -try: - from ConfigParser import SafeConfigParser -except ImportError: # pragma: no cover python 2 vs 3 issue - from configparser import ConfigParser as SafeConfigParser +from configparser import ConfigParser as SafeConfigParser from pacifica.metadata.globals import CONFIG_FILE diff --git a/pacifica/metadata/orm/atool_project.py b/pacifica/metadata/orm/atool_project.py index 8e879d2c..0c8ebcc6 100644 --- a/pacifica/metadata/orm/atool_project.py +++ b/pacifica/metadata/orm/atool_project.py @@ -27,7 +27,7 @@ class AToolProject(CherryPyAPI): analytical_tool = ForeignKeyField(AnalyticalTools, backref='projects') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/atool_transaction.py b/pacifica/metadata/orm/atool_transaction.py index 0584c760..30cc66e7 100644 --- a/pacifica/metadata/orm/atool_transaction.py +++ b/pacifica/metadata/orm/atool_transaction.py @@ -27,7 +27,7 @@ class AToolTransaction(CherryPyAPI): analytical_tool = ForeignKeyField(AnalyticalTools, backref='transactions') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/base.py b/pacifica/metadata/orm/base.py index 8ae60dc6..dadd7c76 100644 --- a/pacifica/metadata/orm/base.py +++ b/pacifica/metadata/orm/base.py @@ -67,7 +67,7 @@ class PacificaModel(Model): deleted = ExtendDateTimeField(null=True, index=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the db connection.""" database = DB diff --git a/pacifica/metadata/orm/citation_contributor.py b/pacifica/metadata/orm/citation_contributor.py index df68f222..985bd811 100644 --- a/pacifica/metadata/orm/citation_contributor.py +++ b/pacifica/metadata/orm/citation_contributor.py @@ -30,7 +30,7 @@ class CitationContributor(CherryPyAPI): author_precedence = IntegerField(default=1) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains database and primary keys.""" database = DB diff --git a/pacifica/metadata/orm/citation_doi.py b/pacifica/metadata/orm/citation_doi.py index 0c7d754a..151d58bd 100644 --- a/pacifica/metadata/orm/citation_doi.py +++ b/pacifica/metadata/orm/citation_doi.py @@ -27,7 +27,7 @@ class CitationDOI(CherryPyAPI): citation = ForeignKeyField(Citations, backref='doi_entries') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/citation_keyword.py b/pacifica/metadata/orm/citation_keyword.py index aa7473cd..193e2f0e 100644 --- a/pacifica/metadata/orm/citation_keyword.py +++ b/pacifica/metadata/orm/citation_keyword.py @@ -27,7 +27,7 @@ class CitationKeyword(CherryPyAPI): keyword = ForeignKeyField(Keywords, backref='citations') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/citation_project.py b/pacifica/metadata/orm/citation_project.py index c56ad427..50df7d92 100644 --- a/pacifica/metadata/orm/citation_project.py +++ b/pacifica/metadata/orm/citation_project.py @@ -27,7 +27,7 @@ class CitationProject(CherryPyAPI): project = ForeignKeyField(Projects, backref='citations') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/citation_transaction.py b/pacifica/metadata/orm/citation_transaction.py index d2974418..17b2317c 100644 --- a/pacifica/metadata/orm/citation_transaction.py +++ b/pacifica/metadata/orm/citation_transaction.py @@ -27,7 +27,7 @@ class CitationTransaction(CherryPyAPI): transaction = ForeignKeyField(TransactionUser, backref='citations') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/dataset_file.py b/pacifica/metadata/orm/dataset_file.py index d9b98efc..2fa7fb29 100644 --- a/pacifica/metadata/orm/dataset_file.py +++ b/pacifica/metadata/orm/dataset_file.py @@ -27,7 +27,7 @@ class DatasetFile(CherryPyAPI): file = ForeignKeyField(Files, backref='files') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/dataset_project_user.py b/pacifica/metadata/orm/dataset_project_user.py index 2f3db42a..3c42aadc 100644 --- a/pacifica/metadata/orm/dataset_project_user.py +++ b/pacifica/metadata/orm/dataset_project_user.py @@ -37,7 +37,7 @@ class DatasetProjectUser(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='dataset_project_user') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/doi_author_mapping.py b/pacifica/metadata/orm/doi_author_mapping.py index 1b8f91fe..3d9fc74e 100644 --- a/pacifica/metadata/orm/doi_author_mapping.py +++ b/pacifica/metadata/orm/doi_author_mapping.py @@ -30,7 +30,7 @@ class DOIAuthorMapping(CherryPyAPI): author_order = IntegerField(default=1) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/doi_info.py b/pacifica/metadata/orm/doi_info.py index c2d642ca..49b0493f 100644 --- a/pacifica/metadata/orm/doi_info.py +++ b/pacifica/metadata/orm/doi_info.py @@ -30,7 +30,7 @@ class DOIInfo(CherryPyAPI): value = CharField() # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/file_key_value.py b/pacifica/metadata/orm/file_key_value.py index f43198cf..23b99ac8 100644 --- a/pacifica/metadata/orm/file_key_value.py +++ b/pacifica/metadata/orm/file_key_value.py @@ -31,7 +31,7 @@ class FileKeyValue(CherryPyAPI): value = ForeignKeyField(Values, backref='file_links') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/institution_user.py b/pacifica/metadata/orm/institution_user.py index d0ab688a..c49b0fef 100644 --- a/pacifica/metadata/orm/institution_user.py +++ b/pacifica/metadata/orm/institution_user.py @@ -32,7 +32,7 @@ class InstitutionUser(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='institution_user') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/instrument_data_source.py b/pacifica/metadata/orm/instrument_data_source.py index 26c08192..7aa61dec 100644 --- a/pacifica/metadata/orm/instrument_data_source.py +++ b/pacifica/metadata/orm/instrument_data_source.py @@ -32,7 +32,7 @@ class InstrumentDataSource(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='instrument_data_source') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/instrument_group.py b/pacifica/metadata/orm/instrument_group.py index 28b9ae5d..86111422 100644 --- a/pacifica/metadata/orm/instrument_group.py +++ b/pacifica/metadata/orm/instrument_group.py @@ -27,7 +27,7 @@ class InstrumentGroup(CherryPyAPI): group = ForeignKeyField(Groups, backref='instrument_members') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/instrument_key_value.py b/pacifica/metadata/orm/instrument_key_value.py index bd4e1a87..296e3a50 100644 --- a/pacifica/metadata/orm/instrument_key_value.py +++ b/pacifica/metadata/orm/instrument_key_value.py @@ -35,7 +35,7 @@ class InstrumentKeyValue(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='instrument_kvp') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/instrument_user.py b/pacifica/metadata/orm/instrument_user.py index 717c8590..6191ac62 100644 --- a/pacifica/metadata/orm/instrument_user.py +++ b/pacifica/metadata/orm/instrument_user.py @@ -32,7 +32,7 @@ class InstrumentUser(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='instrument_user') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/project_group.py b/pacifica/metadata/orm/project_group.py index 5a6342cf..f07fe722 100644 --- a/pacifica/metadata/orm/project_group.py +++ b/pacifica/metadata/orm/project_group.py @@ -27,7 +27,7 @@ class ProjectGroup(CherryPyAPI): project = ForeignKeyField(Projects, backref='groups') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/project_instrument.py b/pacifica/metadata/orm/project_instrument.py index ea26ffb8..de8550cf 100644 --- a/pacifica/metadata/orm/project_instrument.py +++ b/pacifica/metadata/orm/project_instrument.py @@ -33,7 +33,7 @@ class ProjectInstrument(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='relationship') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/project_user.py b/pacifica/metadata/orm/project_user.py index 2b43552a..2c5386cc 100644 --- a/pacifica/metadata/orm/project_user.py +++ b/pacifica/metadata/orm/project_user.py @@ -33,7 +33,7 @@ class ProjectUser(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='project_user') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/sync.py b/pacifica/metadata/orm/sync.py index f4218937..f9fb1fd7 100644 --- a/pacifica/metadata/orm/sync.py +++ b/pacifica/metadata/orm/sync.py @@ -15,7 +15,7 @@ # pylint: disable=too-few-public-methods -class OrmSync(object): +class OrmSync: """ Special module for syncing the orm. @@ -147,7 +147,7 @@ class MetadataSystem(Model): part = CharField(primary_key=True) value = IntegerField(default=-1) - class Meta(object): + class Meta: """Meta object containing the database connection.""" database = DB # This model uses the pacifica_cart database. diff --git a/pacifica/metadata/orm/sync_updates/update_0_1_to_1_0.py b/pacifica/metadata/orm/sync_updates/update_0_1_to_1_0.py index 1c21b64e..e8c77c39 100644 --- a/pacifica/metadata/orm/sync_updates/update_0_1_to_1_0.py +++ b/pacifica/metadata/orm/sync_updates/update_0_1_to_1_0.py @@ -13,7 +13,7 @@ class OldProposals(Model): id = CharField(primary_key=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """This is the meta class for OldTrans.""" database = DB @@ -33,7 +33,7 @@ class OldTrans(Model): deleted = DateTimeField(null=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """This is the meta class for OldTrans.""" database = DB @@ -57,7 +57,7 @@ class OldTransSIP(Model): deleted = DateTimeField(null=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """This is the meta class for OldTrans.""" database = DB @@ -81,7 +81,7 @@ class OldTransSAP(Model): deleted = DateTimeField(null=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """This is the meta class for OldTrans.""" database = DB diff --git a/pacifica/metadata/orm/sync_updates/update_2_1_to_3_0.py b/pacifica/metadata/orm/sync_updates/update_2_1_to_3_0.py index f6ab1b8f..d2d308eb 100644 --- a/pacifica/metadata/orm/sync_updates/update_2_1_to_3_0.py +++ b/pacifica/metadata/orm/sync_updates/update_2_1_to_3_0.py @@ -65,7 +65,7 @@ class OldInstKeyValue(Model): deleted = DateTimeField(index=True, null=True) # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB @@ -97,7 +97,7 @@ def _add_relationship_columns(): migrator.rename_column('doitransaction', 'transaction_id', 'trans_old_id') ) for table_name, rel_info in table_rel.items(): - DB.execute_sql('alter table {} drop constraint {}_pkey'.format(table_name, table_name)) + DB.execute_sql('alter table {0} drop constraint {0}_pkey'.format(table_name)) rel_name, backref, pkey_columns = rel_info rel_obj = Relationships.get(Relationships.name == rel_name) migrate( @@ -122,7 +122,7 @@ def _add_relationship_columns(): condition.append(u'{} = {}'.format(key, param_val)) condition = u' and '.join(condition) DB.execute_sql(u'update {} set uuid = %s where {}'.format(table_name, condition), (str(uuid.uuid4()),)) - DB.execute_sql('alter table {} add constraint {}_pkey primary key (uuid)'.format(table_name, table_name)) + DB.execute_sql('alter table {0} add constraint {0}_pkey primary key (uuid)'.format(table_name)) migrate( migrator.add_column( 'citationtransaction', 'transaction_id', diff --git a/pacifica/metadata/orm/sync_updates/update_6_0_to_7_0.py b/pacifica/metadata/orm/sync_updates/update_6_0_to_7_0.py index fc1ac51e..28898515 100644 --- a/pacifica/metadata/orm/sync_updates/update_6_0_to_7_0.py +++ b/pacifica/metadata/orm/sync_updates/update_6_0_to_7_0.py @@ -16,7 +16,7 @@ class OldRelationships(Model): description = TextField(default='') encoding = CharField(default='UTF8') - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/trans_key_value.py b/pacifica/metadata/orm/trans_key_value.py index f84b26e1..c6e130a5 100644 --- a/pacifica/metadata/orm/trans_key_value.py +++ b/pacifica/metadata/orm/trans_key_value.py @@ -31,7 +31,7 @@ class TransactionKeyValue(CherryPyAPI): value = ForeignKeyField(Values, backref='trans_links') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/transaction_user.py b/pacifica/metadata/orm/transaction_user.py index e5e67346..6f301bfd 100644 --- a/pacifica/metadata/orm/transaction_user.py +++ b/pacifica/metadata/orm/transaction_user.py @@ -34,7 +34,7 @@ class TransactionUser(CherryPyAPI): relationship = ForeignKeyField(Relationships, backref='transaction_user') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/user_group.py b/pacifica/metadata/orm/user_group.py index fa44f119..aff2e6be 100644 --- a/pacifica/metadata/orm/user_group.py +++ b/pacifica/metadata/orm/user_group.py @@ -27,7 +27,7 @@ class UserGroup(CherryPyAPI): group = ForeignKeyField(Groups, backref='members') # pylint: disable=too-few-public-methods - class Meta(object): + class Meta: """PeeWee meta class contains the database and the primary key.""" database = DB diff --git a/pacifica/metadata/orm/utils.py b/pacifica/metadata/orm/utils.py index 30e25215..ea91bd14 100644 --- a/pacifica/metadata/orm/utils.py +++ b/pacifica/metadata/orm/utils.py @@ -29,9 +29,9 @@ def date_converts(date_obj): """Standardize on converting to date objects.""" if isinstance(date_obj, (str, unicode_type)): return parser.parse(date_obj).date() - elif isinstance(date_obj, date): + if isinstance(date_obj, date): return date_obj - elif isinstance(date_obj, int): + if isinstance(date_obj, int): return datetime.utcfromtimestamp(date_obj).date() return None @@ -45,9 +45,9 @@ def datetime_converts(time_obj): """Standardize on converting to datetime objects.""" if isinstance(time_obj, (str, unicode_type)): return parser.parse(time_obj).replace(microsecond=0) - elif isinstance(time_obj, datetime): + if isinstance(time_obj, datetime): return time_obj.replace(microsecond=0) - elif isinstance(time_obj, int): + if isinstance(time_obj, int): return datetime.utcfromtimestamp(time_obj).replace(microsecond=0) return None diff --git a/pacifica/metadata/rest/doi_queries/doi_registration_base.py b/pacifica/metadata/rest/doi_queries/doi_registration_base.py index d1c65294..200b1530 100644 --- a/pacifica/metadata/rest/doi_queries/doi_registration_base.py +++ b/pacifica/metadata/rest/doi_queries/doi_registration_base.py @@ -7,7 +7,7 @@ # pylint: disable=too-few-public-methods -class DOIRegistrationBase(object): +class DOIRegistrationBase: """Base class for DOI registration functionality.""" @staticmethod diff --git a/pacifica/metadata/rest/doiupload.py b/pacifica/metadata/rest/doiupload.py index bb54ad92..375d91bb 100644 --- a/pacifica/metadata/rest/doiupload.py +++ b/pacifica/metadata/rest/doiupload.py @@ -7,7 +7,7 @@ # pylint: disable=too-few-public-methods -class DOIUploadAPI(object): +class DOIUploadAPI: """InstrumentInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/fileinfo.py b/pacifica/metadata/rest/fileinfo.py index b645875a..3feec7a1 100644 --- a/pacifica/metadata/rest/fileinfo.py +++ b/pacifica/metadata/rest/fileinfo.py @@ -7,7 +7,7 @@ # pylint: disable=too-few-public-methods -class FileInfoAPI(object): +class FileInfoAPI: """FileInfoAPI.""" exposed = True diff --git a/pacifica/metadata/rest/fileinfo_queries/file_details.py b/pacifica/metadata/rest/fileinfo_queries/file_details.py index 618f4a28..a2960bce 100644 --- a/pacifica/metadata/rest/fileinfo_queries/file_details.py +++ b/pacifica/metadata/rest/fileinfo_queries/file_details.py @@ -6,7 +6,7 @@ # pylint: disable=too-few-public-methods -class FileDetailsLookup(object): +class FileDetailsLookup: """Retrieves file details for a list of file id's.""" exposed = True diff --git a/pacifica/metadata/rest/fileinfo_queries/files_with_tkv.py b/pacifica/metadata/rest/fileinfo_queries/files_with_tkv.py index 5fa2ce35..f4c15f92 100644 --- a/pacifica/metadata/rest/fileinfo_queries/files_with_tkv.py +++ b/pacifica/metadata/rest/fileinfo_queries/files_with_tkv.py @@ -1,18 +1,15 @@ #!/usr/bin/python # -*- coding: utf-8 -*- """CherryPy File Details object class.""" +from urllib.parse import unquote from cherrypy import tools from peewee import DoesNotExist, fn from pacifica.metadata.orm import Files, TransactionKeyValue, Keys, Values from pacifica.metadata.orm.base import db_connection_decorator -try: - from urllib.parse import unquote -except ImportError: # pragma: no cover - from urlparse import unquote # pylint: disable=too-few-public-methods -class FilesWithTransactionKeyValue(object): +class FilesWithTransactionKeyValue: """Retrieves file details for a list of files having a certain key/value combo.""" exposed = True diff --git a/pacifica/metadata/rest/ingest.py b/pacifica/metadata/rest/ingest.py index f80fb9b7..15f7f203 100644 --- a/pacifica/metadata/rest/ingest.py +++ b/pacifica/metadata/rest/ingest.py @@ -53,7 +53,7 @@ # pylint: disable=too-few-public-methods -class IngestAPI(object): +class IngestAPI: """Uploader ingest API.""" exposed = True diff --git a/pacifica/metadata/rest/instrument_queries/instrument_lookup.py b/pacifica/metadata/rest/instrument_queries/instrument_lookup.py index 1a1d39d6..84254781 100644 --- a/pacifica/metadata/rest/instrument_queries/instrument_lookup.py +++ b/pacifica/metadata/rest/instrument_queries/instrument_lookup.py @@ -47,12 +47,11 @@ def GET(instrument_id=None): if instrument_id is not None and re.match('[0-9]+', instrument_id): cherrypy.log.error('instrument details request') return InstrumentLookup._get_instrument_details(instrument_id) - else: - message = 'Invalid instrument details lookup request. ' - message += "'{0}' is not a valid instrument_id".format( - instrument_id) - cherrypy.log.error(message) - raise HTTPError( - status='400 Invalid Request Options', - message=QueryBase.instrument_help_block_message() - ) + message = 'Invalid instrument details lookup request. ' + message += "'{0}' is not a valid instrument_id".format( + instrument_id) + cherrypy.log.error(message) + raise HTTPError( + status='400 Invalid Request Options', + message=QueryBase.instrument_help_block_message() + ) diff --git a/pacifica/metadata/rest/instrument_queries/query_base.py b/pacifica/metadata/rest/instrument_queries/query_base.py index 429c75c1..f28d2b72 100644 --- a/pacifica/metadata/rest/instrument_queries/query_base.py +++ b/pacifica/metadata/rest/instrument_queries/query_base.py @@ -5,7 +5,7 @@ from pacifica.metadata.orm.groups import Groups -class QueryBase(object): +class QueryBase: """Retrieves a set of instruments for a given keyword set.""" @staticmethod diff --git a/pacifica/metadata/rest/instrumentinfo.py b/pacifica/metadata/rest/instrumentinfo.py index e5acfb37..ebb3f249 100644 --- a/pacifica/metadata/rest/instrumentinfo.py +++ b/pacifica/metadata/rest/instrumentinfo.py @@ -8,7 +8,7 @@ # pylint: disable=too-few-public-methods -class InstrumentInfoAPI(object): +class InstrumentInfoAPI: """InstrumentInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/migration_queries/migrate_instruments.py b/pacifica/metadata/rest/migration_queries/migrate_instruments.py index 396ac273..224d6637 100644 --- a/pacifica/metadata/rest/migration_queries/migrate_instruments.py +++ b/pacifica/metadata/rest/migration_queries/migrate_instruments.py @@ -8,7 +8,7 @@ from pacifica.metadata.rest.instrument_queries.query_base import QueryBase as InstQueryBase -class MigrateInstruments(object): +class MigrateInstruments: """Generate a streamlined query for importing instrument entities and linkages.""" exposed = True diff --git a/pacifica/metadata/rest/migration_queries/migrate_projects.py b/pacifica/metadata/rest/migration_queries/migrate_projects.py index 73f29357..8d58e462 100644 --- a/pacifica/metadata/rest/migration_queries/migrate_projects.py +++ b/pacifica/metadata/rest/migration_queries/migrate_projects.py @@ -8,7 +8,7 @@ from pacifica.metadata.rest.project_queries.query_base import QueryBase as ProjQueryBase -class MigrateProjects(object): +class MigrateProjects: """Generate a streamlined query for importing project entities and linkages.""" exposed = True diff --git a/pacifica/metadata/rest/migration_queries/migrate_users.py b/pacifica/metadata/rest/migration_queries/migrate_users.py index d56cf246..2ea28f56 100644 --- a/pacifica/metadata/rest/migration_queries/migrate_users.py +++ b/pacifica/metadata/rest/migration_queries/migrate_users.py @@ -8,7 +8,7 @@ from pacifica.metadata.rest.user_queries.query_base import QueryBase as UserQueryBase -class MigrateUsers(object): +class MigrateUsers: """Generate a streamlined query for importing instrument entities and linkages.""" exposed = True diff --git a/pacifica/metadata/rest/migrationinfo.py b/pacifica/metadata/rest/migrationinfo.py index d3c41ba4..740f4565 100644 --- a/pacifica/metadata/rest/migrationinfo.py +++ b/pacifica/metadata/rest/migrationinfo.py @@ -7,7 +7,7 @@ # pylint: disable=too-few-public-methods -class MigrationInfoAPI(object): +class MigrationInfoAPI: """MigrationInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/objectinfo.py b/pacifica/metadata/rest/objectinfo.py index ed5093f8..4c999f0f 100644 --- a/pacifica/metadata/rest/objectinfo.py +++ b/pacifica/metadata/rest/objectinfo.py @@ -8,7 +8,7 @@ # pylint: disable=too-few-public-methods -class ObjectInfoAPI(object): +class ObjectInfoAPI: """ObjectInfoAPI API.""" lower_obj = { @@ -59,6 +59,5 @@ def GET(cls, object_class_name=None, operation=None, **where_clause): message = "'{0}' is not a valid class object name".format(object_class_name) raise cherrypy.HTTPError(404, message) return list(cls.lower_obj.keys()) - else: - js_object = myclass.get_object_info(where_clause) + js_object = myclass.get_object_info(where_clause) return js_object diff --git a/pacifica/metadata/rest/project_queries/project_lookup.py b/pacifica/metadata/rest/project_queries/project_lookup.py index 3b90aced..0663379b 100644 --- a/pacifica/metadata/rest/project_queries/project_lookup.py +++ b/pacifica/metadata/rest/project_queries/project_lookup.py @@ -64,12 +64,11 @@ def GET(project_id=None): if project_id is not None and re.match('[0-9]+[a-z]*', project_id): cherrypy.log.error('project details request') return ProjectLookup._get_project_details(project_id) - else: - message = 'Invalid project details lookup request. ' - message += "'{0}' is not a valid project_id".format( - project_id) - cherrypy.log.error(message) - raise HTTPError( - status='400 Invalid Request Options', - message=QueryBase.project_help_block_message() - ) + message = 'Invalid project details lookup request. ' + message += "'{0}' is not a valid project_id".format( + project_id) + cherrypy.log.error(message) + raise HTTPError( + status='400 Invalid Request Options', + message=QueryBase.project_help_block_message() + ) diff --git a/pacifica/metadata/rest/project_queries/project_term_search.py b/pacifica/metadata/rest/project_queries/project_term_search.py index f9140b03..7e589f86 100644 --- a/pacifica/metadata/rest/project_queries/project_term_search.py +++ b/pacifica/metadata/rest/project_queries/project_term_search.py @@ -55,8 +55,7 @@ def GET(search_term=None): """Return a set of projects for a given user.""" if search_term is not None: return ProjectTermSearch.search_for_project(search_term) - else: - raise cherrypy.HTTPError( - '400 No Search Terms Provided', - QueryBase.project_help_block_message() - ) + raise cherrypy.HTTPError( + '400 No Search Terms Provided', + QueryBase.project_help_block_message() + ) diff --git a/pacifica/metadata/rest/project_queries/query_base.py b/pacifica/metadata/rest/project_queries/query_base.py index be80c07b..3b8036d1 100644 --- a/pacifica/metadata/rest/project_queries/query_base.py +++ b/pacifica/metadata/rest/project_queries/query_base.py @@ -4,7 +4,7 @@ import datetime -class QueryBase(object): +class QueryBase: """Retrieves a set of projects for a given keyword set.""" @staticmethod @@ -20,9 +20,8 @@ def format_project_block(project_entry, instruments=None): now = datetime.datetime.now().date() project_state = 'inactive' - currently_active = True if _pe.actual_start_date is not None and _pe.actual_start_date < now else False - currently_closed = True if currently_active and _pe.actual_end_date is not None and \ - _pe.actual_end_date < now else False + currently_active = bool(_pe.actual_start_date is not None and _pe.actual_start_date < now) + currently_closed = bool(currently_active and _pe.actual_end_date is not None and _pe.actual_end_date < now) if not currently_active: project_state = 'pre_active' @@ -32,8 +31,8 @@ def format_project_block(project_entry, instruments=None): else: project_state = 'closed' - currently_active = True if project_state == 'active' and ( - _pe.actual_end_date is None or _pe.actual_end_date >= now) else False + currently_active = bool(project_state == 'active' and ( + _pe.actual_end_date is None or _pe.actual_end_date >= now)) project_state = 'invalid' if _pe.actual_start_date is None and _pe.actual_end_date is None else project_state title = _pe.title if _pe.title is not None else '' year = _pe.actual_end_date.year if _pe.actual_end_date is not None else 'Unknown' diff --git a/pacifica/metadata/rest/projectinfo.py b/pacifica/metadata/rest/projectinfo.py index e5751df6..11f5deb3 100644 --- a/pacifica/metadata/rest/projectinfo.py +++ b/pacifica/metadata/rest/projectinfo.py @@ -8,7 +8,7 @@ # pylint: disable=too-few-public-methods -class ProjectInfoAPI(object): +class ProjectInfoAPI: """ProjectInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/reporting_queries/query_base.py b/pacifica/metadata/rest/reporting_queries/query_base.py index 76af9160..dc0a0276 100644 --- a/pacifica/metadata/rest/reporting_queries/query_base.py +++ b/pacifica/metadata/rest/reporting_queries/query_base.py @@ -5,7 +5,7 @@ # pylint: disable=too-few-public-methods -class QueryBase(object): +class QueryBase: """Formats summary data for other classes down the tree.""" time_basis_mappings = { diff --git a/pacifica/metadata/rest/root.py b/pacifica/metadata/rest/root.py index cd29d621..94262958 100644 --- a/pacifica/metadata/rest/root.py +++ b/pacifica/metadata/rest/root.py @@ -30,7 +30,7 @@ def error_page_default(**kwargs): # pylint: disable=too-few-public-methods -class Root(object): +class Root: """ CherryPy root object class. diff --git a/pacifica/metadata/rest/summaryinfo.py b/pacifica/metadata/rest/summaryinfo.py index 4838bef2..5be009a1 100644 --- a/pacifica/metadata/rest/summaryinfo.py +++ b/pacifica/metadata/rest/summaryinfo.py @@ -6,7 +6,7 @@ # pylint: disable=too-few-public-methods -class SummaryInfoAPI(object): +class SummaryInfoAPI: """SummaryInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/tkvinfo.py b/pacifica/metadata/rest/tkvinfo.py index 2ebe5829..1bda1c07 100644 --- a/pacifica/metadata/rest/tkvinfo.py +++ b/pacifica/metadata/rest/tkvinfo.py @@ -6,7 +6,7 @@ # pylint: disable=too-few-public-methods -class TkvInfoAPI(object): +class TkvInfoAPI: """Transaction Key Value Info API.""" exposed = True diff --git a/pacifica/metadata/rest/tkvinfo_queries/kvs_for_transaction.py b/pacifica/metadata/rest/tkvinfo_queries/kvs_for_transaction.py index 3dfbc7cd..71079365 100644 --- a/pacifica/metadata/rest/tkvinfo_queries/kvs_for_transaction.py +++ b/pacifica/metadata/rest/tkvinfo_queries/kvs_for_transaction.py @@ -7,7 +7,7 @@ # pylint: disable=too-few-public-methods -class KVsForTransaction(object): +class KVsForTransaction: """Retrieves a list of key/value pairs for a transaction_id.""" exposed = True diff --git a/pacifica/metadata/rest/tkvinfo_queries/values_for_key.py b/pacifica/metadata/rest/tkvinfo_queries/values_for_key.py index 9ce57483..b957fa14 100644 --- a/pacifica/metadata/rest/tkvinfo_queries/values_for_key.py +++ b/pacifica/metadata/rest/tkvinfo_queries/values_for_key.py @@ -2,18 +2,15 @@ # -*- coding: utf-8 -*- """CherryPy File Details object class.""" from datetime import datetime +from urllib.parse import unquote from dateutil.parser import parse from cherrypy import tools from pacifica.metadata.orm import TransactionKeyValue, Keys, Values, TransSIP from pacifica.metadata.orm.base import db_connection_decorator -try: - from urllib.parse import unquote -except ImportError: # pragma: no cover - from urlparse import unquote # pylint: disable=too-few-public-methods -class ValuesForKey(object): +class ValuesForKey: """Retrieves a list of values for a given key from the trans_key_value table.""" exposed = True diff --git a/pacifica/metadata/rest/tkvupload.py b/pacifica/metadata/rest/tkvupload.py index b6b3ff16..0093ddac 100644 --- a/pacifica/metadata/rest/tkvupload.py +++ b/pacifica/metadata/rest/tkvupload.py @@ -5,7 +5,7 @@ # pylint: disable=too-few-public-methods -class TkvUploadAPI(object): +class TkvUploadAPI: """InstrumentInfo API.""" exposed = True diff --git a/pacifica/metadata/rest/tkvupload_queries/upload_entries.py b/pacifica/metadata/rest/tkvupload_queries/upload_entries.py index 2c6e9b1b..d8580e40 100644 --- a/pacifica/metadata/rest/tkvupload_queries/upload_entries.py +++ b/pacifica/metadata/rest/tkvupload_queries/upload_entries.py @@ -8,7 +8,7 @@ # pylint: disable=too-few-public-methods -class UploadEntries(object): +class UploadEntries: """Uploads new transaction key/value pairs to Pacifica.""" upload_keys_cache = {} diff --git a/pacifica/metadata/rest/transaction_queries/file_lookup.py b/pacifica/metadata/rest/transaction_queries/file_lookup.py index 0f3cfcdc..62f00a1c 100644 --- a/pacifica/metadata/rest/transaction_queries/file_lookup.py +++ b/pacifica/metadata/rest/transaction_queries/file_lookup.py @@ -23,12 +23,11 @@ def GET(transaction_id=None): if transaction_id is not None and re.match('[0-9]+', transaction_id): cherrypy.log.error('file details request') return QueryBase._get_file_list(transaction_id) - else: - message = 'Invalid file details lookup request. ' - message += "'{0}' is not a valid transaction_id".format( - transaction_id) - cherrypy.log.error(message) - raise HTTPError( - status='400 Invalid Request Options', - message=QueryBase.compose_help_block_message() - ) + message = 'Invalid file details lookup request. ' + message += "'{0}' is not a valid transaction_id".format( + transaction_id) + cherrypy.log.error(message) + raise HTTPError( + status='400 Invalid Request Options', + message=QueryBase.compose_help_block_message() + ) diff --git a/pacifica/metadata/rest/transaction_queries/query_base.py b/pacifica/metadata/rest/transaction_queries/query_base.py index 8ed671d1..cf2cbc8a 100644 --- a/pacifica/metadata/rest/transaction_queries/query_base.py +++ b/pacifica/metadata/rest/transaction_queries/query_base.py @@ -9,7 +9,7 @@ # pylint: disable=too-few-public-methods -class QueryBase(object): +class QueryBase: """Retrieves a set of projects for a given keyword set.""" valid_keywords = [ @@ -34,7 +34,7 @@ def _get_transaction_key_values(transaction_id): .dicts()) # pylint: enable=no-member - return [tkv for tkv in tkv_list] + return list(tkv_list) @staticmethod def _get_file_list(transaction_id): diff --git a/pacifica/metadata/rest/transaction_queries/transaction_lookup.py b/pacifica/metadata/rest/transaction_queries/transaction_lookup.py index 6e827133..ad2efa4c 100644 --- a/pacifica/metadata/rest/transaction_queries/transaction_lookup.py +++ b/pacifica/metadata/rest/transaction_queries/transaction_lookup.py @@ -23,12 +23,11 @@ def GET(trans_id=None): if trans_id is not None and re.match('[0-9]+', trans_id): cherrypy.log.error('transaction details request') return QueryBase._get_transaction_info_block(trans_id) - else: - message = 'Invalid transaction details lookup request. ' - message += "'{0}' is not a valid transaction_id".format( - trans_id) - cherrypy.log.error(message) - raise HTTPError( - '400 Invalid Transaction ID', - QueryBase.compose_help_block_message() - ) + message = 'Invalid transaction details lookup request. ' + message += "'{0}' is not a valid transaction_id".format( + trans_id) + cherrypy.log.error(message) + raise HTTPError( + '400 Invalid Transaction ID', + QueryBase.compose_help_block_message() + ) diff --git a/pacifica/metadata/rest/transaction_queries/transaction_search.py b/pacifica/metadata/rest/transaction_queries/transaction_search.py index de32ae5f..f1ec145c 100644 --- a/pacifica/metadata/rest/transaction_queries/transaction_search.py +++ b/pacifica/metadata/rest/transaction_queries/transaction_search.py @@ -89,9 +89,8 @@ def GET(option='details', **kwargs): '400 Invalid Request Options', QueryBase.compose_help_block_message() ) - else: - transactions, transaction_search_stats = TransactionSearch._search_transactions( - kwargs) + transactions, transaction_search_stats = TransactionSearch._search_transactions( + kwargs) results = QueryBase._get_transaction_info_blocks(transactions, option) results.update(transaction_search_stats) diff --git a/pacifica/metadata/rest/transactioninfo.py b/pacifica/metadata/rest/transactioninfo.py index ec6085cd..0a91e9a6 100644 --- a/pacifica/metadata/rest/transactioninfo.py +++ b/pacifica/metadata/rest/transactioninfo.py @@ -10,7 +10,7 @@ # pylint: disable=too-few-public-methods -class TransactionInfoAPI(object): +class TransactionInfoAPI: """TransactionInfoAPI API.""" exposed = True diff --git a/pacifica/metadata/rest/user_queries/query_base.py b/pacifica/metadata/rest/user_queries/query_base.py index 90eadd85..6637f602 100644 --- a/pacifica/metadata/rest/user_queries/query_base.py +++ b/pacifica/metadata/rest/user_queries/query_base.py @@ -4,7 +4,7 @@ from pacifica.metadata.orm import UserGroup, Projects, ProjectUser -class QueryBase(object): +class QueryBase: """Retrieves a set of projects for a given keyword set.""" @staticmethod diff --git a/pacifica/metadata/rest/user_queries/user_lookup.py b/pacifica/metadata/rest/user_queries/user_lookup.py index b91ac4b3..d355fa45 100644 --- a/pacifica/metadata/rest/user_queries/user_lookup.py +++ b/pacifica/metadata/rest/user_queries/user_lookup.py @@ -42,9 +42,8 @@ def GET(person_id=None, option=None): if person_id is not None and re.match('[0-9]+', person_id): cherrypy.log.error('id lookup request') return UserLookup.get_user_info_block(person_id, option) - else: - cherrypy.log.error('invalid request') - raise cherrypy.HTTPError( - '400 Invalid Lookup Options', - QueryBase.compose_help_block_message() - ) + cherrypy.log.error('invalid request') + raise cherrypy.HTTPError( + '400 Invalid Lookup Options', + QueryBase.compose_help_block_message() + ) diff --git a/pacifica/metadata/rest/user_queries/user_search.py b/pacifica/metadata/rest/user_queries/user_search.py index 8a28fe72..f873bdcd 100644 --- a/pacifica/metadata/rest/user_queries/user_search.py +++ b/pacifica/metadata/rest/user_queries/user_search.py @@ -58,9 +58,8 @@ def GET(search_term=None, option=None, **kwargs): if search_term is not None and search_term: cherrypy.log.error('search request') return UserSearch.search_for_user(search_term, option) - else: - cherrypy.log.error('invalid request') - raise cherrypy.HTTPError( - '400 Invalid Request Options', - QueryBase.compose_help_block_message() - ) + cherrypy.log.error('invalid request') + raise cherrypy.HTTPError( + '400 Invalid Request Options', + QueryBase.compose_help_block_message() + ) diff --git a/pacifica/metadata/rest/userinfo.py b/pacifica/metadata/rest/userinfo.py index ed6da45b..9f8bd502 100644 --- a/pacifica/metadata/rest/userinfo.py +++ b/pacifica/metadata/rest/userinfo.py @@ -29,7 +29,7 @@ def func_wrapper(*args, **kwargs): # pylint: disable=too-few-public-methods -class UserInfoAPI(object): +class UserInfoAPI: """UserInfo API.""" exposed = True diff --git a/requirements-dev.txt b/requirements-dev.txt index 8f6ae367..c3048bcc 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,14 +2,14 @@ coverage httpretty mock -pbs +pbs; sys_platform == 'win32' pep257 pre-commit -pylint<2.0 +pylint>2 pytest radon readthedocs-sphinx-ext recommonmark -sh +sh; sys_platform != 'win32' sphinx sphinx-rtd-theme diff --git a/tests/cherrypy_catch_test.py b/tests/cherrypy_catch_test.py index c6ec39cc..b64be7c6 100644 --- a/tests/cherrypy_catch_test.py +++ b/tests/cherrypy_catch_test.py @@ -5,7 +5,7 @@ # pylint: disable=too-few-public-methods -class Root(object): +class Root: """Example root cherrypy class, method dispatcher required.""" exposed = True diff --git a/tests/core/cmd_test.py b/tests/core/cmd_test.py index a8e3f8a7..ec692adf 100644 --- a/tests/core/cmd_test.py +++ b/tests/core/cmd_test.py @@ -16,7 +16,7 @@ except ImportError: import pbs - class Sh(object): + class Sh: """Sh style wrapper.""" def __getattr__(self, attr): @@ -55,7 +55,7 @@ def requests_retry_session(retries=3, backoff_factor=0.5, status_forcelist=(500, return session -class AdminCmdBase(object): +class AdminCmdBase: """Test base class for setting up update environments.""" virtualenv_dir = mkdtemp() diff --git a/tests/orm/base_test.py b/tests/orm/base_test.py index 8a0a3cbb..4369e64b 100644 --- a/tests/orm/base_test.py +++ b/tests/orm/base_test.py @@ -47,7 +47,6 @@ def dependent_cls(): @classmethod def base_create_dep_objs(cls): """Create dependent objects.""" - pass def base_create_obj(self, cls, obj_hash): """Create obj based on the class given."""