From c6d3d86d3a1ed78cc9d849c9abe3ad32ce40eaf8 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Fri, 18 Jan 2019 08:48:48 +0100 Subject: [PATCH 1/3] pep8 --- wcs_olap/feeder.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index 59b0459..9d525db 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -582,8 +582,8 @@ class WcsFormdefFeeder(object): columns.append([at, 'smallint REFERENCES {role_table} (id)']) comments[at] = u'fonction « %s »' % name - self.columns = ([name for name, _type in self.olap_feeder.columns] - + [name for name, _type in columns]) + self.columns = ([name for name, _type in self.olap_feeder.columns] + [ + name for name, _type in columns]) self.columns.remove('geolocation_base') self.create_table('{formdata_table}', columns, inherits='{generic_formdata_table}', @@ -594,7 +594,7 @@ class WcsFormdefFeeder(object): # Creat index for JSON fields if self.has_jsonb: for field in fields: - if field.varname and not '-' in field.varname: + if field.varname and '-' not in field.varname: self.create_formdata_json_index(field.varname) # PostgreSQL does not propagate foreign key constraints to child tables @@ -775,7 +775,7 @@ class WcsFormdefFeeder(object): if generic_evolutions: self.ex('INSERT INTO {generic_evolution_table} (%s) VALUES %s' % ( ', '.join(['formdata_id', 'generic_status_id', 'time', 'date', 'hour_id']), - ', '.join(['%s'] * len(generic_evolutions))), vars=generic_evolutions) + ', '.join(['%s'] * len(generic_evolutions))), vars=generic_evolutions) # insert evolutions evolutions = [] @@ -784,10 +784,10 @@ class WcsFormdefFeeder(object): row[0] = formdata_id evolutions.append(tuple(row)) if len(evolutions) == 500: - self.ex('INSERT INTO {evolution_table} (%s) VALUES %s' % ( + self.ex('INSERT INTO {evolution_table} (%s) VALUES %s' % ( ', '.join(['formdata_id', 'status_id', 'time', 'date', 'hour_id']), ', '.join(['%s'] * len(evolutions))), vars=evolutions) - evolutions = [] + evolutions = [] if evolutions: self.ex('INSERT INTO {evolution_table} (%s) VALUES %s' % ( ', '.join(['formdata_id', 'status_id', 'time', 'date', 'hour_id']), -- 2.20.1