pylint

apache · Sep 29, 2022 · 65968cc · 65968cc
1 parent 877ac2f
commit 65968cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/superset/common/query_context.py b/superset/common/query_context.py
@@ -47,7 +47,7 @@ class QueryContext:
     enforce_numerical_metrics: ClassVar[bool] = True
 
     datasource: BaseDatasource
-    slice: Optional[Slice] = None
+    slice_: Optional[Slice] = None
     queries: List[QueryObject]
     form_data: Optional[Dict[str, Any]]
     result_type: ChartDataResultType
@@ -66,7 +66,7 @@ def __init__(
         *,
         datasource: BaseDatasource,
         queries: List[QueryObject],
-        slice: Optional[Slice],
+        slice_: Optional[Slice],
         form_data: Optional[Dict[str, Any]],
         result_type: ChartDataResultType,
         result_format: ChartDataResultFormat,
@@ -75,7 +75,7 @@ def __init__(
         cache_values: Dict[str, Any],
     ) -> None:
         self.datasource = datasource
-        self.slice = slice
+        self.slice_ = slice_
         self.result_type = result_type
         self.result_format = result_format
         self.queries = queries
@@ -102,8 +102,8 @@ def get_payload(
     def get_cache_timeout(self) -> Optional[int]:
         if self.custom_cache_timeout is not None:
             return self.custom_cache_timeout
-        if self.slice and self.slice.cache_timeout is not None:
-            return self.slice.cache_timeout
+        if self.slice_ and self.slice_.cache_timeout is not None:
+            return self.slice_.cache_timeout
         if self.datasource.cache_timeout is not None:
             return self.datasource.cache_timeout
         if hasattr(self.datasource, "database"):

diff --git a/superset/common/query_context_factory.py b/superset/common/query_context_factory.py
@@ -58,9 +58,9 @@ def create(
         if datasource:
             datasource_model_instance = self._convert_to_model(datasource)
 
-        slice = None
+        slice_ = None
         if form_data and form_data.get("slice_id") is not None:
-            slice = self._get_slice(form_data.get("slice_id"))
+            slice_ = self._get_slice(form_data.get("slice_id"))
 
         result_type = result_type or ChartDataResultType.FULL
         result_format = result_format or ChartDataResultFormat.JSON
@@ -79,7 +79,7 @@ def create(
         return QueryContext(
             datasource=datasource_model_instance,
             queries=queries_,
-            slice=slice,
+            slice_=slice_,
             form_data=form_data,
             result_type=result_type,
             result_format=result_format,