QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-23 18:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

pylint: accept specific 2 character names by default (#9460)

Browse Source 
* lint: accept 2 letter names by default

* Address review comments

* Remove e and d from good-names
This commit is contained in:
Ville Brofeldt
2020-04-08 20:32:26 +03:00
committed by GitHub
parent 4485800e21
commit 980dd2fd41
72 changed files with 421 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
superset/datasets/api.py
View File

@@ -171,11 +171,11 @@ class DatasetRestApi(BaseSupersetModelRestApi):
try:
new_model = CreateDatasetCommand(g.user, item.data).run()
return self.response(201, id=new_model.id, result=item.data)
except DatasetInvalidError as e:
return self.response_422(message=e.normalized_messages())
except DatasetCreateFailedError as e:
logger.error(f"Error creating model {self.__class__.__name__}: {e}")
return self.response_422(message=str(e))
except DatasetInvalidError as ex:
return self.response_422(message=ex.normalized_messages())
except DatasetCreateFailedError as ex:
logger.error(f"Error creating model {self.__class__.__name__}: {ex}")
return self.response_422(message=str(ex))
@expose("/<pk>", methods=["PUT"])
@protect()
@@ -238,11 +238,11 @@ class DatasetRestApi(BaseSupersetModelRestApi):
return self.response_404()
except DatasetForbiddenError:
return self.response_403()
except DatasetInvalidError as e:
return self.response_422(message=e.normalized_messages())
except DatasetUpdateFailedError as e:
logger.error(f"Error updating model {self.__class__.__name__}: {e}")
return self.response_422(message=str(e))
except DatasetInvalidError as ex:
return self.response_422(message=ex.normalized_messages())
except DatasetUpdateFailedError as ex:
logger.error(f"Error updating model {self.__class__.__name__}: {ex}")
return self.response_422(message=str(ex))
@expose("/<pk>", methods=["DELETE"])
@protect()
@@ -286,9 +286,9 @@ class DatasetRestApi(BaseSupersetModelRestApi):
return self.response_404()
except DatasetForbiddenError:
return self.response_403()
except DatasetDeleteFailedError as e:
logger.error(f"Error deleting model {self.__class__.__name__}: {e}")
return self.response_422(message=str(e))
except DatasetDeleteFailedError as ex:
logger.error(f"Error deleting model {self.__class__.__name__}: {ex}")
return self.response_422(message=str(ex))
@expose("/export/", methods=["GET"])
@protect()
@@ -345,7 +345,7 @@ class DatasetRestApi(BaseSupersetModelRestApi):
@expose("/<pk>/refresh", methods=["PUT"])
@protect()
@safe
def refresh(self, pk: int) -> Response: # pylint: disable=invalid-name
def refresh(self, pk: int) -> Response:
"""Refresh a Dataset
---
put:
@@ -384,6 +384,6 @@ class DatasetRestApi(BaseSupersetModelRestApi):
return self.response_404()
except DatasetForbiddenError:
return self.response_403()
except DatasetRefreshFailedError as e:
logger.error(f"Error refreshing dataset {self.__class__.__name__}: {e}")
return self.response_422(message=str(e))
except DatasetRefreshFailedError as ex:
logger.error(f"Error refreshing dataset {self.__class__.__name__}: {ex}")
return self.response_422(message=str(ex))

8
superset/datasets/commands/create.py
View File

@@ -60,8 +60,8 @@ class CreateDatasetCommand(BaseCommand):
"schema_access", dataset.schema_perm
)
db.session.commit()
except (SQLAlchemyError, DAOCreateFailedError) as e:
logger.exception(e)
except (SQLAlchemyError, DAOCreateFailedError) as ex:
logger.exception(ex)
db.session.rollback()
raise DatasetCreateFailedError()
return dataset
@@ -92,8 +92,8 @@ class CreateDatasetCommand(BaseCommand):
try:
owners = populate_owners(self._actor, owner_ids)
self._properties["owners"] = owners
except ValidationError as e:
exceptions.append(e)
except ValidationError as ex:
exceptions.append(ex)
if exceptions:
exception = DatasetInvalidError()
exception.add_list(exceptions)

4
superset/datasets/commands/delete.py
View File

@@ -51,8 +51,8 @@ class DeleteDatasetCommand(BaseCommand):
"datasource_access", dataset.get_perm()
)
db.session.commit()
except (SQLAlchemyError, DAODeleteFailedError) as e:
logger.exception(e)
except (SQLAlchemyError, DAODeleteFailedError) as ex:
logger.exception(ex)
db.session.rollback()
raise DatasetDeleteFailedError()
return dataset

4
superset/datasets/commands/refresh.py
View File

@@ -46,8 +46,8 @@ class RefreshDatasetCommand(BaseCommand):
try:
self._model.fetch_metadata()
return self._model
except Exception as e:
logger.exception(e)
except Exception as ex:
logger.exception(ex)
raise DatasetRefreshFailedError()
raise DatasetRefreshFailedError()

8
superset/datasets/commands/update.py
View File

@@ -60,8 +60,8 @@ class UpdateDatasetCommand(BaseCommand):
try:
dataset = DatasetDAO.update(self._model, self._properties)
return dataset
except DAOUpdateFailedError as e:
logger.exception(e.exception)
except DAOUpdateFailedError as ex:
logger.exception(ex.exception)
raise DatasetUpdateFailedError()
raise DatasetUpdateFailedError()
@@ -92,8 +92,8 @@ class UpdateDatasetCommand(BaseCommand):
try:
owners = populate_owners(self._actor, owner_ids)
self._properties["owners"] = owners
except ValidationError as e:
exceptions.append(e)
except ValidationError as ex:
exceptions.append(ex)
# Validate columns
columns = self._properties.get("columns")

8
superset/datasets/dao.py
View File

@@ -45,8 +45,8 @@ class DatasetDAO(BaseDAO):
def get_database_by_id(database_id: int) -> Optional[Database]:
try:
return db.session.query(Database).filter_by(id=database_id).one_or_none()
except SQLAlchemyError as e: # pragma: no cover
logger.error(f"Could not get database by id: {e}")
except SQLAlchemyError as ex: # pragma: no cover
logger.error(f"Could not get database by id: {ex}")
return None
@staticmethod
@@ -54,8 +54,8 @@ class DatasetDAO(BaseDAO):
try:
database.get_table(table_name, schema=schema)
return True
except SQLAlchemyError as e: # pragma: no cover
logger.error(f"Got an error {e} validating table: {table_name}")
except SQLAlchemyError as ex: # pragma: no cover
logger.error(f"Got an error {ex} validating table: {table_name}")
return False
@staticmethod

4
superset/datasets/schemas.py
View File

@@ -39,7 +39,7 @@ def validate_python_date_format(value: str) -> None:
class DatasetColumnsPutSchema(Schema):
id = fields.Integer() # pylint: disable=invalid-name
id = fields.Integer()
column_name = fields.String(required=True, validate=Length(1, 255))
type = fields.String(validate=Length(1, 32))
verbose_name = fields.String(allow_none=True, Length=(1, 1024))
@@ -55,7 +55,7 @@ class DatasetColumnsPutSchema(Schema):
class DatasetMetricsPutSchema(Schema):
id = fields.Integer() # pylint: disable=invalid-name
id = fields.Integer()
expression = fields.String(required=True)
description = fields.String(allow_none=True)
metric_name = fields.String(required=True, validate=Length(1, 255))