Flake8 fixes

Author: ponyisi

servicex/query.py

@@ -496,7 +496,7 @@ async def as_signed_urls_async(self, display_progress: bool = True,
 
 class QueryStringGenerator(ABC):
     '''This abstract class just defines an interface to give the selection string'''
-    @abc.abstractmethod    
+    @abc.abstractmethod
     def generate_selection_string(self) -> str:
         pass
 
@@ -512,12 +512,12 @@ def generate_selection_string(self) -> str:
 
 class GenericQuery(Query):
     '''
-    This class gives a "generic" Query object which doesn't require 
+    This class gives a "generic" Query object which doesn't require
     overloading the constructor
     '''
     query_string_generator: Optional[QueryStringGenerator] = None
 
     def generate_selection_string(self) -> str:
         if self.query_string_generator is None:
             raise RuntimeError('query string generator not set')
-        return self.query_string_generator.generate_selection_string()
+        return self.query_string_generator.generate_selection_string()

servicex/servicex_client.py

@@ -36,8 +36,6 @@
 from servicex.types import DID
 from servicex.python_dataset import PythonQuery
 from servicex.dataset_group import DatasetGroup
-import ast
-import qastle
 
 from make_it_sync import make_sync
 from servicex.databinder_models import ServiceXSpec, General, Sample
@@ -60,12 +58,12 @@ def get_codegen(_sample: Sample, _general: General):
         if sample.Query:
             # if string or QueryStringGenerator, turn into a Query
             if isinstance(sample.Query, str) or isinstance(sample.Query, QueryStringGenerator):
-                sample.Query = sx.generic_query(dataset_identifier=sample.dataset_identifier, 
-                                    title=sample.Name,
-                                     codegen=get_codegen(sample, config.General),
-                                     result_format=config.General.OutputFormat,
-                                     ignore_cache=sample.IgnoreLocalCache,
-                                     query=sample.Query)
+                sample.Query = sx.generic_query(dataset_identifier=sample.dataset_identifier,
+                                                title=sample.Name,
+                                                codegen=get_codegen(sample, config.General),
+                                                result_format=config.General.OutputFormat,
+                                                ignore_cache=sample.IgnoreLocalCache,
+                                                query=sample.Query)
             # query._q_ast = sample.Query._q_ast
             # query._item_type = sample.Query._item_type
             if isinstance(sample.Query, FuncADLQuery):

servicex/uproot_raw/uproot_raw.py

@@ -32,13 +32,14 @@
 from typing import List, Union, Mapping, Optional
 from ..query import QueryStringGenerator
 
+
 class SubQuery(pydantic.BaseModel):
-    treename: Union[Mapping[str,str], List[str], str]
+    treename: Union[Mapping[str, str], List[str], str]
     expressions: Optional[Union[List[str], str]]
     cut: Optional[str]
     filter_name: Optional[Union[List[str], str]]
     filter_typename: Optional[Union[List[str], str]]
-    aliases: Optional[Mapping[str,str]]
+    aliases: Optional[Mapping[str, str]]
     copy_histogram: Optional[bool]