Title: [971] Minor code simplification in format_query()
- Revision
- 971
- Author
- cito
- Date
- 2019-04-19 14:27:41 -0400 (Fri, 19 Apr 2019)
Log Message
Minor code simplification in format_query()
Modified Paths
Diff
Modified: branches/5.0.x/pg.py (970 => 971)
--- branches/5.0.x/pg.py 2019-04-19 13:39:56 UTC (rev 970)
+++ branches/5.0.x/pg.py 2019-04-19 18:27:41 UTC (rev 971)
@@ -691,17 +691,14 @@
literals = [adapt(value) for value in values]
else:
add = params.add
- literals = []
- append = literals.append
if types:
if (not isinstance(types, (list, tuple)) or
len(types) != len(values)):
raise TypeError('The values and types do not match')
- for value, typ in zip(values, types):
- append(add(value, typ))
+ literals = [add(value, typ)
+ for value, typ in zip(values, types)]
else:
- for value in values:
- append(add(value))
+ literals = [add(value) for value in values]
command %= tuple(literals)
elif isinstance(values, dict):
# we want to allow extra keys in the dictionary,
@@ -722,15 +719,14 @@
for key, value in values.items())
else:
add = params.add
- literals = {}
if types:
if not isinstance(types, dict):
raise TypeError('The values and types do not match')
- for key in sorted(values):
- literals[key] = add(values[key], types.get(key))
+ literals = dict((key, add(values[key], types.get(key)))
+ for key in sorted(values))
else:
- for key in sorted(values):
- literals[key] = add(values[key])
+ literals = dict((key, add(values[key]))
+ for key in sorted(values))
command %= literals
else:
raise TypeError('The values must be passed as tuple, list or dict')
Modified: trunk/pg.py (970 => 971)
--- trunk/pg.py 2019-04-19 13:39:56 UTC (rev 970)
+++ trunk/pg.py 2019-04-19 18:27:41 UTC (rev 971)
@@ -690,17 +690,14 @@
literals = [adapt(value) for value in values]
else:
add = params.add
- literals = []
- append = literals.append
if types:
if (not isinstance(types, (list, tuple)) or
len(types) != len(values)):
raise TypeError('The values and types do not match')
- for value, typ in zip(values, types):
- append(add(value, typ))
+ literals = [add(value, typ)
+ for value, typ in zip(values, types)]
else:
- for value in values:
- append(add(value))
+ literals = [add(value) for value in values]
command %= tuple(literals)
elif isinstance(values, dict):
# we want to allow extra keys in the dictionary,
@@ -721,15 +718,14 @@
for key, value in values.items())
else:
add = params.add
- literals = {}
if types:
if not isinstance(types, dict):
raise TypeError('The values and types do not match')
- for key in sorted(values):
- literals[key] = add(values[key], types.get(key))
+ literals = dict((key, add(values[key], types.get(key)))
+ for key in sorted(values))
else:
- for key in sorted(values):
- literals[key] = add(values[key])
+ literals = dict((key, add(values[key]))
+ for key in sorted(values))
command %= literals
else:
raise TypeError('The values must be passed as tuple, list or dict')
_______________________________________________
PyGreSQL mailing list
[email protected]
https://mail.vex.net/mailman/listinfo/pygresql
