From 48918e93a2e0acd1ddb5ba2d0d33422ba52e63c9 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Sat, 2 Jun 2018 08:40:47 +0200 Subject: [PATCH] sample: python gui python3 compat --- .../__pycache__/rclmain.cpython-35.pyc | Bin 0 -> 3086 bytes src/python/samples/recollgui/qrecoll.py | 45 +++++++++--------- 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 src/python/samples/recollgui/__pycache__/rclmain.cpython-35.pyc diff --git a/src/python/samples/recollgui/__pycache__/rclmain.cpython-35.pyc b/src/python/samples/recollgui/__pycache__/rclmain.cpython-35.pyc new file mode 100644 index 0000000000000000000000000000000000000000..88b2f96c473593ccba6a830fbb4c35a62e7b7d1c GIT binary patch literal 3086 zcmbVOTXWk)6khpm$4(sQQbN-tZJ{(2;(GUJhxVNRC)3Xv@1Id%?mo;f+z+04IzF5Aq; zg|^%d1&{M>`Dp0I<+gm`I!9baHVKS=8BFfsiLPVdj4Z)0EWtL6zyj>S2(W3MV@@7M z3UTe3+kIlW!3#HV!eg6Y=$FM)z_X1fdYNPFwZS|U$hpA`S}0fmo@baLGtA492$-)K z>*i?ma!Lb1L4zdn2{jQasAWM39y;@3wd$USbOHmke(@=Fr#Q9|O8siCe=9dh64ekPS${G@jMdnn} z#gYQ6GjEyV_Abyk3Io*lNPS|xqR`)G-o;7kDsyHg*EpwYx<&+gGwO;&&R&|1VC{cI zFb+pYu=dUfK%I&JYxp*`yV|$4)VK8f*Oim&N@F%SuHO!@5vvYk_$Py%Axskg2aiWJ*pu2HHEpI5Hh1BpTV zUh)0bn+rgQi+vsp4=oXwX!6h{q)1wF7!k2z+0qSzofB7Xer?twF26tYxGndrJ~s=n z=$>&wo|wh9F6W|1tC{xmR(PU=5+zM}Jf@V1QfTi|Xre-kvgJ4$z$~|S-GJ{nt`svP zmPRrwZ58Wt#35=LwF3|KL*KPe&GOF4zzQ5UI5HRE>Em=OJ5q3I_sj;U&yx)w(dJ2# zyGK3wFck1W_Tmafm0-^ItZ168c45Nm9017K1K}PWaS@sG?fZuj&e)dUN!}-4&Dp(h zN@N*2_!tIUw1!e*e*-!~$E>yw_=#+Z@HpZ^%pyWDr^DPIMm;Sn@Rerp5mvR9m?x1s zLF(K}_OaA{f)j07LM$i@2t49ppHl|W_tDI^pW-O-A~~^0B!W$}u-P4z2ZXRh%qo~E z2?u^(<%U=$9-W_Fn-xkVJ&$YHcwq&RZ%O{lHOo?O5_jUF9R>l+$9dZiBaV!Dg5=fN zWi}FK#}8%HI;Ctw2a$`o|5DKBTu|!%&cr3W{@QK!5LMF&?Votm9Ei|EQ_*}m^nHoV zYzl6NzTb?5-5i|CUKlhZt3U7|syRnPw<&DDkLF=(a2gj8&l(+7&^B;WaA7xYY-~R@i~G7pnYj)sl$oPy zWad=ynb9d*Z&MF>e=xv>x2Q73NU0>h%vo%Z?*9&4>2p!t48&nAj%%v-~9e*Ti#K7B=D_a cswT&UP!($>^)A4;^o{o8TPnyA6@}HzKNR}4PXGV_ literal 0 HcmV?d00001 diff --git a/src/python/samples/recollgui/qrecoll.py b/src/python/samples/recollgui/qrecoll.py index f71e2122..c26e47bc 100755 --- a/src/python/samples/recollgui/qrecoll.py +++ b/src/python/samples/recollgui/qrecoll.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import print_function import sys import datetime @@ -67,11 +68,11 @@ class RecollQuery(QtCore.QAbstractTableModel): def rowCount(self, parent): ret = len(self.docs) - #print "RecollQuery.rowCount(): ", ret + #print("RecollQuery.rowCount(): %d"% ret) return ret def columnCount(self, parent): - #print "RecollQuery.columnCount()" + #print("RecollQuery.columnCount()") if parent.isValid(): return 0 else: @@ -79,7 +80,7 @@ class RecollQuery(QtCore.QAbstractTableModel): def setquery(self, db, q, sortfield="", ascending=True): """Parse and execute query on open db""" - #print "RecollQuery.setquery():" + #print("RecollQuery.setquery():") # Get query object self.query = db.query() if sortfield: @@ -98,7 +99,7 @@ class RecollQuery(QtCore.QAbstractTableModel): return None def sort(self, col, order): - #print "sort", col, order + #print("sort %s %s", (col, order)) self.setquery(self.db, self.qtext, sortfield=self.attrs[col], ascending = order) @@ -108,7 +109,7 @@ class RecollQuery(QtCore.QAbstractTableModel): return None def data(self, index, role): - #print "RecollQuery.data: row %d, role: " % (index.row(),), role + #print("RecollQuery.data: row %d, role: %s" % (index.row(),role)) if not index.isValid(): return QtCore.QVariant() @@ -116,8 +117,8 @@ class RecollQuery(QtCore.QAbstractTableModel): return QtCore.QVariant() if role == QtCore.Qt.DisplayRole: - #print "RecollQuery.data: row %d, col %d role: " % \ - # (index.row(), index.column()), role + #print("RecollQuery.data: row %d, col %d role: %s" % \ + # (index.row(), index.column() role)) attr = self.attrs[index.column()] value = getattr(self.docs[index.row()], attr) if attr == "mtime": @@ -128,14 +129,14 @@ class RecollQuery(QtCore.QAbstractTableModel): return QtCore.QVariant() def canFetchMore(self, parent): - #print "RecollQuery.canFetchMore:" + #print("RecollQuery.canFetchMore:") if len(self.docs) < self.totres: return True else: return False def fetchMore(self, parent): - #print "RecollQuery.fetchMore:" + #print("RecollQuery.fetchMore:") self.beginInsertRows(QtCore.QModelIndex(), len(self.docs), \ len(self.docs) + self.pagelen) for count in range(self.pagelen): @@ -155,11 +156,11 @@ class RclGui_Main(QMainWindow): self.ui.setupUi(self) self.db = db self.qmodel = RecollQuery() - scq = QShortcut(QKeySequence("Ctrl+Q"), self); + scq = QShortcut(QKeySequence("Ctrl+Q"), self) scq.activated.connect(self.onexit) - header = self.ui.resTable.horizontalHeader(); - header.setSortIndicatorShown(True); - header.setSortIndicator(-1, QtCore.Qt.AscendingOrder); + header = self.ui.resTable.horizontalHeader() + header.setSortIndicatorShown(True) + header.setSortIndicator(-1, QtCore.Qt.AscendingOrder) self.ui.resTable.setSortingEnabled(True) self.currentindex = -1 self.currentdoc = None @@ -172,7 +173,7 @@ class RclGui_Main(QMainWindow): self.currentindex = index self.currentdoc = doc if doc is None: - print "NO DoC" + print("NO DoC") return query = self.qmodel.query groups = query.getgroups() @@ -181,7 +182,7 @@ class RclGui_Main(QMainWindow): self.ui.resDetail.setText(abs) if hasextract: ipath = doc.get('ipath') - #print "ipath[%s]" % (ipath,) + #print("ipath[%s]" % ipath) self.ui.previewPB.setEnabled(True) if ipath: self.ui.savePB.setEnabled(True) @@ -190,12 +191,12 @@ class RclGui_Main(QMainWindow): @pyqtSlot() def on_previewPB_clicked(self): - print "on_previewPB_clicked(self)" + print("on_previewPB_clicked(self)") newdoc = textextract(self.currentdoc) query = self.qmodel.query; groups = query.getgroups() meths = HlMeths(groups) - #print "newdoc.mimetype:", newdoc.mimetype + #print("newdoc.mimetype:", newdoc.mimetype) if newdoc.mimetype == 'text/html': ishtml = True else: @@ -210,7 +211,7 @@ class RclGui_Main(QMainWindow): @pyqtSlot() def on_savePB_clicked(self): - print "on_savePB_clicked(self)" + print("on_savePB_clicked(self)") doc = self.currentdoc ipath = doc.ipath if not ipath: @@ -219,9 +220,9 @@ class RclGui_Main(QMainWindow): if fn: docitems = doc.items() fn = extractofile(doc, str(fn.toLocal8Bit())) - print "Saved as", fn + print("Saved as %s" % fn) else: - print >> sys.stderr, "Canceled" + print("Canceled", file=sys.stderr) def startQuery(self): self.qmodel.setquery(self.db, self.ui.searchEntry.text()) @@ -232,7 +233,7 @@ class RclGui_Main(QMainWindow): def Usage(): - print >> sys.stderr, '''Usage: qt.py [ [ ...]]''' + print('''Usage: qt.py [ [ ...]]''', file=sys.stderr) sys.exit(1) @@ -254,7 +255,7 @@ def main(args): elif opt == "-i": extra_dbs.append(val) else: - print >> sys.stderr, "Bad opt: ", opt + print("Bad opt: %s"% opt, file=sys.stderr) Usage() # The query should be in the remaining arg(s)