ZSQLCatalog.buildSQLQuery: Avoid single-use local.

bc9d5827 · Vincent Pelletier · 5250346d · bc9d5827
Commit bc9d5827 authored Sep 24, 2015 by Vincent Pelletier
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

product/ZSQLCatalog/SQLCatalog.py product/ZSQLCatalog/SQLCatalog.py +10 -5

No files found.
--- a/product/ZSQLCatalog/SQLCatalog.py
+++ b/product/ZSQLCatalog/SQLCatalog.py
@@ -2424,11 +2424,16 @@ class Catalog(Folder,
                          ignore_empty_string=1, only_group_columns=False,
                          limit=None, extra_column_list=(),
                          **kw):
-    query = self.buildEntireQuery(kw, query_table=query_table,
+    return self.buildEntireQuery(
-      ignore_empty_string=ignore_empty_string, limit=limit,
+      kw,
-      extra_column_list=extra_column_list)
+      query_table=query_table,
-    result = query.asSQLExpression(self, only_group_columns).asSQLExpressionDict()
+      ignore_empty_string=ignore_empty_string,
-    return result
+      limit=limit,
+      extra_column_list=extra_column_list,
+    ).asSQLExpression(
+      self,
+      only_group_columns,
+    ).asSQLExpressionDict()
  # Compatibililty SQL Sql
  buildSqlQuery = buildSQLQuery