From d509bc88e1e06483712c93b8cf2780fee177dd85 Mon Sep 17 00:00:00 2001 From: Sebastien Besson Date: Mon, 15 Dec 2014 13:29:33 +0000 Subject: [PATCH] Flake8 sql --- setup.cfg | 2 +- sql/misc/enums.py | 91 ++++++++++++++------------- sql/psql/OMERO4.2__0/t/OMERO4.1__0.py | 21 ++++--- 3 files changed, 62 insertions(+), 52 deletions(-) diff --git a/setup.cfg b/setup.cfg index edf92a31a0a..038b4ff5206 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,2 @@ [flake8] -exclude=.git,components/bioformats,components/blitz/generated,components/tools/**/build,components/**/target,components/tools/OmeroPy/src/omero_ext,*pytest-*,components/tools/OmeroWeb/omeroweb/webclient,components/tools/OmeroWeb/omeroweb/webgateway,dist,docs/sphinx,docs/sphinx-api,target,examples,sql +exclude=.git,components/bioformats,components/blitz/generated,components/tools/**/build,components/**/target,components/tools/OmeroPy/src/omero_ext,*pytest-*,components/tools/OmeroWeb/omeroweb/webclient,components/tools/OmeroWeb/omeroweb/webgateway,dist,docs/sphinx,docs/sphinx-api,target,examples diff --git a/sql/misc/enums.py b/sql/misc/enums.py index 456028d747a..2c5c0374df5 100755 --- a/sql/misc/enums.py +++ b/sql/misc/enums.py @@ -2,7 +2,8 @@ # -*- coding: utf-8 -*- # Calculated via: -# grep enum components/model/resources/mappings/* | grep "id=" | perl -pe 's/^.*?\".*[.](.*?)\".*?$/$1/' | sort >> sql/misc/enums.py +# grep enum components/model/resources/mappings/* | grep "id=" | perl -pe +# 's/^.*?\".*[.](.*?)\".*?$/$1/' | sort >> sql/misc/enums.py ENUMS = """ AcquisitionMode ArcType @@ -37,53 +38,59 @@ import psycopg2 import sys + def connect(db1, user, password): - conn1 = psycopg2.connect("host='localhost' dbname='%s' user='%s' password='%s'" % (db1,user,password)) - return conn1 + conn1 = psycopg2.connect( + "host='localhost' dbname='%s' user='%s' password='%s'" + % (db1, user, password)) + return conn1 + def list(conn, table): - cur = conn.cursor() - cur.execute("""select * from pg_tables where schemaname='public' and tablename ilike '%s'""" % table) - if len(cur.fetchall()) == 0: - return [], True - else: - cur.execute('select value from %s' % table) - return [x[0] for x in cur.fetchall()], False + cur = conn.cursor() + cur.execute("select * from pg_tables where schemaname='public' and" + " tablename ilike '%s'" % table) + if len(cur.fetchall()) == 0: + return [], True + else: + cur.execute('select value from %s' % table) + return [x[0] for x in cur.fetchall()], False + def compare(conn1, conn2, table): - l1, l1_deleted = list(conn1,table); - l1.sort() - l2, l2_deleted = list(conn2,table) - l2.sort() + l1, l1_deleted = list(conn1, table) + l1.sort() + l2, l2_deleted = list(conn2, table) + l2.sort() - output = [] - matcher = difflib.SequenceMatcher(None, l1, l2) - for tag, i1, i2, j1, j2 in matcher.get_opcodes(): - if tag != "equal": - output.append(" %7s l1[%d:%d] (%s) l2[%d:%d] (%s)" % (tag, i1, i2, l1[i1:i2], j1, j2, l2[j1:j2])) - if len(output) > 0: - print "%s : ================== " % table - if l1_deleted: - print " ** ADDED ** " - elif l2_deleted: - print " ** DELETED ** " - for l in output: - print l + output = [] + matcher = difflib.SequenceMatcher(None, l1, l2) + for tag, i1, i2, j1, j2 in matcher.get_opcodes(): + if tag != "equal": + output.append(" %7s l1[%d:%d] (%s) l2[%d:%d] (%s)" + % (tag, i1, i2, l1[i1:i2], j1, j2, l2[j1:j2])) + if len(output) > 0: + print "%s : ================== " % table + if l1_deleted: + print " ** ADDED ** " + elif l2_deleted: + print " ** DELETED ** " + for l in output: + print l if __name__ == "__main__": - if len(sys.argv) != 5: - print "Usage: enums.py olddb newdb username password" - else: - a = sys.argv - d1 = a[1] - d2 = a[2] - u = a[3] - p = a[4] - conn1 = connect(d1,u,p) - print "From: %s" % conn1 - conn2 = connect(d2,u,p) - print "To: %s" % conn2 - - for enum in ENUMS: - compare(conn1, conn2, enum) + if len(sys.argv) != 5: + print "Usage: enums.py olddb newdb username password" + else: + a = sys.argv + d1 = a[1] + d2 = a[2] + u = a[3] + p = a[4] + conn1 = connect(d1, u, p) + print "From: %s" % conn1 + conn2 = connect(d2, u, p) + print "To: %s" % conn2 + for enum in ENUMS: + compare(conn1, conn2, enum) diff --git a/sql/psql/OMERO4.2__0/t/OMERO4.1__0.py b/sql/psql/OMERO4.2__0/t/OMERO4.1__0.py index ca8ae8422db..aba63823395 100644 --- a/sql/psql/OMERO4.2__0/t/OMERO4.1__0.py +++ b/sql/psql/OMERO4.2__0/t/OMERO4.1__0.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import omero c = omero.client("localhost") -s = c.createSession("root","ome") +s = c.createSession("root", "ome") admin = s.getAdminService() @@ -54,7 +54,7 @@ ## -## SPW +# SPW ## # Objects @@ -98,6 +98,8 @@ di.instrument = i filters = [omero.model.FilterI() for x in range(10)] + + def f(): filter = filters.pop() filter.instrument = i @@ -119,22 +121,22 @@ def f(): # Plates for #2428 plates = [] plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setColumnNamingConvention(_("a")) plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setColumnNamingConvention(_("A")) plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setColumnNamingConvention(_("1")) plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setRowNamingConvention(_("a")) plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setRowNamingConvention(_("A")) plates.append(omero.model.PlateI()) -plates[-1].name=_("test data") +plates[-1].name = _("test data") plates[-1].setRowNamingConvention(_("1")) for plate in plates: @@ -175,6 +177,7 @@ def f(): roi = updates.saveAndReturnObject(roi) # Shares -sid = shares.createShare("my description", None, [well], [owner, nonOwner], [], True) +sid = shares.createShare( + "my description", None, [well], [owner, nonOwner], [], True) print "done"