Qtclient py3

.gitignore

@@ -13,6 +13,8 @@ envPaths
 !*configure/ExampleRELEASE.local
 O.*/
 QtC-*
+ui_*.py
+*_rc.py
 *.so
 *.pyc
 __pycache__/

configure/CONFIG_SITE

@@ -45,3 +45,8 @@ USR_INCLUDES += -I $(INSTALL_LOCATION)/include
 # default if not set
 PYTHON ?= python
 
+PYRCC ?= pyrcc4
+
+PYRCCFLAGS_NO = -py2
+PYRCCFLAGS_YES = -py3
+PYRCCFLAGS = $(PYRCCFLAGS_$(PY_IS3)) $(CMD_PYRCCFLAGS)

makehelper.py

@@ -42,6 +42,11 @@
 print('TARGET_CFLAGS +=',get_config_var('BASECFLAGS'), file=out)
 print('TARGET_CXXFLAGS +=',get_config_var('BASECFLAGS'), file=out)
 
+if tuple(int(comp) for comp in get_config_var('VERSION').split('.')) >= (3,0):
+    print('PY_IS3 := YES', file=out)
+else:
+    print('PY_IS3 := NO', file=out)
+
 print('PY_VER :=',get_config_var('VERSION'), file=out)
 ldver = get_config_var('LDVERSION')
 if ldver is None:

python/Makefile

@@ -36,6 +36,12 @@ PY += minimasar/test/__init__.py
 PY += minimasar/test/test_db.py
 PY += minimasar/test/test_ops.py
 
+# generated to remove
+QTCLEANS += masarclient/ui/ui_commentdetail.py
+QTCLEANS += masarclient/ui/ui_commentdiag.py
+QTCLEANS += masarclient/ui/ui_masar.py
+QTCLEANS += masarclient/ui/masarRC_rc.py
+
 include $(TOP)/configure/RULES
 include $(TOP)/configure/RULES_PY
 
@@ -44,3 +50,22 @@ nose.%:
 	[ -d "$(P4P)/python$(PY_LD_VER)/$(T_A)/p4p" ]
 	PYTHONPATH="${PYTHONPATH}:$(abspath $(P4P))/python$(PY_LD_VER)/$(T_A):$(abspath $(TOP))/python$(PY_LD_VER)/$(T_A)" $(PYTHON) -m nose -P -v $* $(NOSEFLAGS)
 endif
+
+ui_%.py: ui_%.ui
+	$(PYTHON) -c 'import PyQt4.uic.pyuic' -o $@ --from-imports $<
+
+# pyrcc4 is not python code...
+# So there is no recipe like:  python -c '...'
+%_rc.py: %.qrc Makefile
+	$(PYRCC) $(PYRCCFLAGS) -o $@ $<
+
+ifndef T_A
+ifdef BASE_3_15
+realclean: qt_clean
+else
+realclean:: qt_clean
+endif
+
+qt_clean:
+	$(RM) $(QTCLEANS)
+endif

python/masarclient/masarClient.py

@@ -182,7 +182,7 @@ def saveSnapshot(self, params):
 
                     otherwise, False if nothing is found.
         """
-        print "saveSnapshot", params
+        print("saveSnapshot", params)
         R = self._proxy.saveSnapshot(**params)
         return (R.timeStamp.userTag, # actually new event #
                 R.channelName,

python/masarclient/ui/authendlg.py

@@ -10,12 +10,9 @@
 
 from PyQt4.QtGui import (QDialog, QVBoxLayout, QGridLayout, QLabel,
                          QDialogButtonBox, QLineEdit)
-from PyQt4.QtCore import (QString, QObject, SIGNAL,Qt)
+from PyQt4.QtCore import (QObject, SIGNAL,Qt)
 
-try:
-    _fromUtf8 = QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
+_fromUtf8 = lambda s: s
 
 class AuthenDlg(QDialog):
     def __init__(self, password, parent=None):
@@ -67,4 +64,4 @@ def result(self):
             return None
         else:
             return (self.password)
-
+

python/masarclient/ui/commentdetail.py

@@ -8,7 +8,7 @@
 from PyQt4.QtCore import (pyqtSignature)
 from PyQt4.QtGui import (QApplication, QDialog, QDialogButtonBox)
 
-import ui_commentdetail
+from . import ui_commentdetail
 
 class CommentDetail(QDialog,
         ui_commentdetail.Ui_commentdetail):

python/masarclient/ui/commentdlg.py

@@ -8,7 +8,7 @@
 from PyQt4.QtCore import (pyqtSignature)
 from PyQt4.QtGui import (QApplication, QDialog, QDialogButtonBox)
 
-import ui_commentdiag
+from . import ui_commentdiag
 
 class CommentDlg(QDialog,
         ui_commentdiag.Ui_commentdlg):

python/masarclient/ui/finddlg.py

@@ -9,13 +9,10 @@
 from __future__ import unicode_literals
 
 from PyQt4.QtGui import (QDialog, QGridLayout, QLineEdit, QPushButton, QBrush, QLabel)
-from PyQt4.QtCore import (QString, QObject, SIGNAL, Qt)
+from PyQt4.QtCore import (QObject, SIGNAL, Qt)
 import re, fnmatch
 #from masar import masarUI #ImportError: cannot import name masarUI
-try:
-    _fromUtf8 = QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
+_fromUtf8 = lambda s: s
 
 class FindDlg(QDialog):
     #def __init__(self, info, parent=None):
@@ -120,4 +117,4 @@ def cleanup(self):
             table.item(self.foundPVPos[i],0).setBackground(QBrush(Qt.white))
 
         self.close()
-
+

python/masarclient/ui/getmasarconfig.py

@@ -9,7 +9,10 @@
 
 import os
 import platform
-import ConfigParser
+try:
+    from configparser import SafeConfigParser as ConfigParser
+except ImportError:
+    from ConfigParser import SafeConfigParser as ConfigParser
 
 def getmasarconfig():
     '''Get configuration file for MASAR service which enables service integration for Olog and channel finder for example.
@@ -29,7 +32,7 @@ def getmasarconfig():
     '''
     system = platform.system()
 
-    config = ConfigParser.ConfigParser()
+    config = ConfigParser()
     if system == 'Windows':
         raise RuntimeError("Does not support Windows platform yet.")
 
@@ -55,4 +58,4 @@ def getmasarconfig():
     return masarconfig
 
 if __name__ == "__main__":
-    print getmasarconfig()
+    print(getmasarconfig())

python/masarclient/ui/gradualput.py

@@ -10,14 +10,11 @@
 
 from PyQt4.QtGui import (QDialog, QGridLayout, QDialogButtonBox, QLineEdit, QPushButton, 
                          QLabel, QMessageBox)
-from PyQt4.QtCore import (QString, QObject, SIGNAL, Qt)
+from PyQt4.QtCore import (QObject, SIGNAL, Qt)
 import cothread
 from cothread.catools import caget, caput
 import traceback
-try:
-    _fromUtf8 = QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
+_fromUtf8 = lambda s: s
 
 
 class GradualPut(QDialog):
@@ -136,4 +133,4 @@ def rampingPut(self):
             #QMessageBox.warning(self, 'Warning', "Oops: something wrong with multiple-step gradual put")
 
         return True
-
+

python/masarclient/ui/masar.py

@@ -18,13 +18,10 @@
 from PyQt4.QtGui import (QApplication, QMainWindow, QMessageBox, QTableWidgetItem, QTableWidget,
                         QFileDialog, QColor, QBrush, QTabWidget, QShortcut, QKeySequence,
                         QDialog, QGridLayout, QLineEdit, QPushButton, QLabel, QDialogButtonBox)
-from PyQt4.QtCore import (QDateTime, Qt, QString, QObject, SIGNAL, QThread, QEventLoop)
+from PyQt4.QtCore import (QDateTime, Qt, QObject, SIGNAL, QThread, QEventLoop)
 #import PyQt4.QTest as QTest
 
-try:
-    _fromUtf8 = QString.fromUtf8
-except AttributeError:
-    _fromUtf8 = lambda s: s
+_fromUtf8 = lambda s: s
 
 if sys.version_info[:2]>=(2,7):
     from collections import OrderedDict as odict
@@ -38,14 +35,14 @@
 except ImportError:
     pyOlogExisting = False
 
-import ui_masar
-import commentdlg
-from showarrayvaluedlg import ShowArrayValueDlg
-from selectrefsnapshotdlg import ShowSelectRefDlg
-from finddlg import FindDlg
-from verifysetpoint import VerifySetpoint
-from gradualput import GradualPut
-import getmasarconfig 
+from . import ui_masar
+from . import commentdlg
+from .showarrayvaluedlg import ShowArrayValueDlg
+from .selectrefsnapshotdlg import ShowSelectRefDlg
+from .finddlg import FindDlg
+from .verifysetpoint import VerifySetpoint
+from .gradualput import GradualPut
+from . import getmasarconfig 
 
 import masarclient.masarClient as masarClient
 
@@ -293,33 +290,34 @@ def setTable(self, data, table):
         The data has to be an ordered dictionary, and table is a QtGui.QTableWidget
         Here is an example to construct an ordered dictionary.
         """
+        datavalues = list(data.values())
         if data:
-            length = len(data.values()[0])
+            length = len(datavalues[0])
         else:
             print ('data is empty, exit.')
             return
-        for i in range(1, len(data.values())):
-            if length != len(data.values()[i]):
+        for i in range(1, len(datavalues)):
+            if length != len(datavalues[i]):
                 QMessageBox.warning(self,
                                     "Warning",
                                     "Data length are not consistent.")
 
                 return
 
         if isinstance(data, odict) and isinstance(table, QTableWidget):
-            nrows = len(data.values()[0])
+            nrows = len(datavalues[0])
             ncols = len(data)
             table.setRowCount(nrows)
             table.setColumnCount(ncols)
             # Removes all items in the view, and also all selections
             table.clear()
-            table.setHorizontalHeaderLabels(data.keys())
+            table.setHorizontalHeaderLabels(list(data.keys()))
 
             n = 0
             for key in data:
                 m = 0
                 for item in data[key]:
-                    if not isinstance(item, basestring):
+                    if not isinstance(item, str):
                         item = str(item)
                     if item:
                         newitem = QTableWidgetItem(item)
@@ -344,7 +342,7 @@ def createNewTableWidget(self, eventID, label):
         types of tables in snapshotTab: comment(Welcome page), ordinary(double-click on event table), 
         preview, compare, filter
         """
-        if self.tabWindowDict.has_key(str(eventID)):
+        if str(eventID) in self.tabWindowDict:
             tableWidget = self.tabWindowDict[str(eventID)]
         else:
             tableWidget = QTableWidget()
@@ -427,7 +425,7 @@ def createLogEntry(self, logText, logbookName = None):
                 #import requests
                 #print("requests version: %s"%requests.__version__) 
                 from pyOlog import OlogClient, Tag, Logbook, LogEntry  
-                if 'https_proxy' in os.environ.keys():
+                if 'https_proxy' in os.environ:
                     #print("unset https_proxy: %s"%(os.environ['https_proxy']))
                     del os.environ['https_proxy']   
 
@@ -496,7 +494,7 @@ def saveMachineSnapshot(self):
             self.data4eid[str(eid)] = data
             self.e2cDict[str(self.previewId)] = [configID, configDesc, cname]#needed for configTab
 
-            label = QString.fromUtf8((cname+': Preview: '+str(eid)))
+            label = ((cname+': Preview: '+str(eid)))
             tabWidget = self.createNewTableWidget('preview', label)
             self.setSnapshotTable(data, tabWidget, eid)
             #sort the table by "Connection"
@@ -952,7 +950,7 @@ def setSnapshotTabWindow(self, eventNames, eventTs, eventIds):
                                     "Can't get snapshot data for eventId:%s"%eventIds[i])
 
             ts = eventTs[i].split('.')[0] 
-            label = QString.fromUtf8((eventNames[i]+': ' +eventIds[i]+": "+ ts))            
+            label = ((eventNames[i]+': ' +eventIds[i]+": "+ ts))            
             tableWidget = self.createNewTableWidget(eventIds[i], label)        
             self.setSnapshotTable(data, tableWidget, eventIds[i])
 
@@ -1011,7 +1009,7 @@ def __showArrayData(self, row, column):
 
     def __find_key(self, dic, val):
         """return the key of dictionary dic given the value"""
-        return [k for k, v in dic.iteritems() if v == val][0]
+        return [k for k, v in dic.items() if v == val][0]
 
     def retrieveMasarData(self, eventid=None):
         """
@@ -1073,14 +1071,15 @@ def setSnapshotTable(self, data, table, eventid):
         called by setSnapshotTabWindow(), saveMachineSnapshot()(preview table), and searchPV() 
         This table is different from compareSnapshotsTable, see setCompareSnapshotsTable()
         """
+        datavalues = list(data.values())
         if data:
-            length = len(data.values()[0])
+            length = len(datavalues[0])
         else:
             print ('data is empty, exit.')
             return
 
-        for i in range(1, len(data.values())):
-            if length != len(data.values()[i]):
+        for i in range(1, len(datavalues)):
+            if length != len(datavalues[i]):
                 QMessageBox.warning(self,
                                     "Warning",
                                     "Data length are not consistent.")
@@ -1090,7 +1089,7 @@ def setSnapshotTable(self, data, table, eventid):
             table.setSortingEnabled(False)
             table.clear()
 
-            nrows = len(data.values()[0])
+            nrows = len(datavalues[0])
             keys = ['PV Name', 'Saved Connection', 'Not Restore', 'Saved Value', 'Live Value', 'Diff',
                     'Saved Timestamp', 'Saved Status', 'Saved Severity',
                     'Live Connection', 'Live Timestamp', 'Live Status', 'Live Severity']
@@ -1440,7 +1439,7 @@ def simplePut(self, eid, eid4Log, r_pvlist, r_data, no_restorepvs, rowCount):
         configFile = dirPath + '/configure/' + self.e2cDict[eid][2] + '.cfg'
         if not os.path.isfile(configFile):
             return
-        if not self.verifyWindowDict.has_key(configFile):
+        if configFile not in self.verifyWindowDict:
             verifyWin = VerifySetpoint(configFile, rowCount, self.verifyWindowDict, self)
             verifyWin.show()
             self.verifyWindowDict[configFile] = verifyWin  
@@ -1872,7 +1871,7 @@ def compareSnapshots(self):
         #data[i]['keyword'] is a tuple; data[i]['keyword'][index] is the element value in the tuple                   
 
         #try:
-        if self.tabWindowDict.has_key('compare'):
+        if 'compare' in self.tabWindowDict:
             tableWidget = self.tabWindowDict['compare']
         else:
             tableWidget = QTableWidget()
@@ -1882,7 +1881,7 @@ def compareSnapshots(self):
         labelText = ""
         for eventId in eventIds:
             labelText += '_' + eventId
-        label = QString.fromUtf8("Compare Snapshots: IDs" + labelText)
+        label = ("Compare Snapshots: IDs" + labelText)
         self.snapshotTabWidget.addTab(tableWidget, label)
         self.snapshotTabWidget.setTabText(self.snapshotTabWidget.count(), label)
         self.snapshotTabWidget.setCurrentIndex(self.snapshotTabWidget.count())