From 767b32284be2c6843505e96295547d556c633dcf Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@mbi-berlin.de>
Date: Wed, 16 Sep 2020 08:59:52 +0200
Subject: [PATCH] try to fix for use with PyQt5

---
 examples/simple/__main__.py                   | 10 ++++---
 examples/{tango => simple_tango}/__init__.py  |  0
 examples/{tango => simple_tango}/__main__.py  |  0
 examples/{tango => simple_tango}/example.html |  0
 examples/{tango => simple_tango}/example.svg  | 26 ++++++++++++++-----
 examples/{tango => simple_tango}/example1.css |  0
 examples/simple_tango/models.json             |  5 ++++
 examples/tango/models.json                    |  5 ----
 setup.cfg                                     |  2 +-
 svgsynoptic2/caseless.py                      |  8 +++---
 svgsynoptic2/jsinterface.py                   |  4 +--
 svgsynoptic2/synopticwidget.py                | 26 ++++++++++---------
 svgsynoptic2/taurusregistry.py                | 20 +++++++-------
 svgsynoptic2/taurussynopticwidget.py          | 24 ++++++++---------
 14 files changed, 73 insertions(+), 57 deletions(-)
 rename examples/{tango => simple_tango}/__init__.py (100%)
 rename examples/{tango => simple_tango}/__main__.py (100%)
 rename examples/{tango => simple_tango}/example.html (100%)
 rename examples/{tango => simple_tango}/example.svg (88%)
 rename examples/{tango => simple_tango}/example1.css (100%)
 create mode 100755 examples/simple_tango/models.json
 delete mode 100755 examples/tango/models.json

diff --git a/examples/simple/__main__.py b/examples/simple/__main__.py
index 44c8d79..f858fe5 100755
--- a/examples/simple/__main__.py
+++ b/examples/simple/__main__.py
@@ -15,10 +15,12 @@
 class ExampleSynopticWidget(SynopticWidget):
 
     "A custom subclass of the synoptic widget."
-
-    def on_click(self, kind, name):
-        # Overriding the click event handler to print information
-        print "click", kind, name
+    def __init__(self, url=None, parent=None, *args, **kwargs):
+        super(ExampleSynopticWidget, self).__init__(url=None, parent=None, *args, **kwargs)
+        
+    #def on_click(self, kind, name):
+    #    # Overriding the click event handler to print information
+    #    print("click", kind, name)
 
 
 def main():
diff --git a/examples/tango/__init__.py b/examples/simple_tango/__init__.py
similarity index 100%
rename from examples/tango/__init__.py
rename to examples/simple_tango/__init__.py
diff --git a/examples/tango/__main__.py b/examples/simple_tango/__main__.py
similarity index 100%
rename from examples/tango/__main__.py
rename to examples/simple_tango/__main__.py
diff --git a/examples/tango/example.html b/examples/simple_tango/example.html
similarity index 100%
rename from examples/tango/example.html
rename to examples/simple_tango/example.html
diff --git a/examples/tango/example.svg b/examples/simple_tango/example.svg
similarity index 88%
rename from examples/tango/example.svg
rename to examples/simple_tango/example.svg
index 27bb269..48df97c 100755
--- a/examples/tango/example.svg
+++ b/examples/simple_tango/example.svg
@@ -14,7 +14,7 @@
    viewBox="0 0 517.09657 662.55852"
    id="svg6521"
    version="1.1"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="example.svg">
   <defs
      id="defs6523" />
@@ -26,15 +26,15 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.95821164"
-     inkscape:cx="344.24245"
+     inkscape:cx="227.87985"
      inkscape:cy="370.27965"
      inkscape:document-units="px"
-     inkscape:current-layer="layer4"
+     inkscape:current-layer="g5656"
      showgrid="false"
-     inkscape:window-width="1920"
-     inkscape:window-height="1140"
-     inkscape:window-x="0"
-     inkscape:window-y="31"
+     inkscape:window-width="1880"
+     inkscape:window-height="1175"
+     inkscape:window-x="40"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata6526">
@@ -101,6 +101,18 @@
            width="99.143021"
            id="rect5654"
            style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#cccccc;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <text
+           id="text15509-3"
+           y="429.69769"
+           x="144.52406"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:semi-condensed;font-size:12px;line-height:0%;font-family:'DejaVu Sans';-inkscape-font-specification:'DejaVu Sans, Semi-Condensed';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           xml:space="preserve"><desc
+             id="desc15511-6">model=sys/tg_test/1/double_scalar</desc><tspan
+             y="429.69769"
+             x="144.52406"
+             id="tspan15513-7"
+             sodipodi:role="line"
+             style="font-size:22.5px;line-height:1;stroke-width:1px">test</tspan></text>
       </g>
     </g>
     <g
diff --git a/examples/tango/example1.css b/examples/simple_tango/example1.css
similarity index 100%
rename from examples/tango/example1.css
rename to examples/simple_tango/example1.css
diff --git a/examples/simple_tango/models.json b/examples/simple_tango/models.json
new file mode 100755
index 0000000..db45b0b
--- /dev/null
+++ b/examples/simple_tango/models.json
@@ -0,0 +1,5 @@
+{
+  "value1" 	:  "sys/tg_test/1/double_scalar",
+  "value2"      :  "sys/tg_test/1/ampli",
+  "value3"      :  "sys/tg_test/1/ampli"
+}
diff --git a/examples/tango/models.json b/examples/tango/models.json
deleted file mode 100755
index 07e2415..0000000
--- a/examples/tango/models.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "value1" 		:  "sys/tg_test/1/double_scalar",
-  "value2"      :  "sys/tg_test/1/ampli",
-  "value3"      :  "sys/tg_test/2/ampli"
-}
diff --git a/setup.cfg b/setup.cfg
index 8a5aee2..94147cf 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -8,4 +8,4 @@ requires = python-fandango
            python-pytango
            qtwebkit
 
-release = 1%{?dist}.maxlab
+release = maxlab
diff --git a/svgsynoptic2/caseless.py b/svgsynoptic2/caseless.py
index 9aaa5ad..5d8beda 100755
--- a/svgsynoptic2/caseless.py
+++ b/svgsynoptic2/caseless.py
@@ -44,8 +44,8 @@ class CaselessDictionary(MutableMapping):
     def __init__(self, *args, **kwargs):
         self.__dict__["_dict"] = {}
         temp_dict = dict(*args, **kwargs)
-        for key, value in temp_dict.iteritems():
-            if isinstance(key, basestring):
+        for key, value in temp_dict.items():
+            if isinstance(key, str):
                 key = CaselessString.make_caseless(key)
             self._dict[key] = value
 
@@ -90,7 +90,7 @@ def __cmp__(self, other):
 
     @classmethod
     def make_caseless(cls, string):
-        if isinstance(string, unicode):
+        if isinstance(string, str):
             return CaselessUnicode(string)
         return CaselessStr(string)
 
@@ -99,5 +99,5 @@ class CaselessStr(CaselessString, str):
     pass
 
 
-class CaselessUnicode(CaselessString, unicode):
+class CaselessUnicode(CaselessString, str):
     pass
diff --git a/svgsynoptic2/jsinterface.py b/svgsynoptic2/jsinterface.py
index eac6121..4c1254b 100755
--- a/svgsynoptic2/jsinterface.py
+++ b/svgsynoptic2/jsinterface.py
@@ -1,6 +1,6 @@
 from threading import Lock
 
-from PyQt4 import QtCore
+from PyQt5 import QtCore
 
 
 class JSInterface(QtCore.QObject):
@@ -65,7 +65,7 @@ def setup(self):
 
     @QtCore.pyqtSlot(str, str, str)
     def run_plugin_command(self, plugin, cmd, args):
-        print "run_plugin_command", plugin, cmd, args
+        print("run_plugin_command", plugin, cmd, args)
         # Note: since we're using signals to loosely connect with the widget
         # it's not possible to get a return value. But we probably don't
         # want that anyway since it might block..?
diff --git a/svgsynoptic2/synopticwidget.py b/svgsynoptic2/synopticwidget.py
index 01ee26f..7e64fd4 100755
--- a/svgsynoptic2/synopticwidget.py
+++ b/svgsynoptic2/synopticwidget.py
@@ -8,10 +8,11 @@
 import os
 import json
 
-from PyQt4 import Qt, QtCore, QtGui
-from PyQt4.QtWebKit import QWebPage, QWebView, QWebSettings, QWebInspector
+from PyQt5 import Qt, QtCore, QtGui, QtWidgets
+from PyQt5.QtWebKitWidgets import  QWebView, QWebPage, QWebInspector
+from PyQt5.QtWebKit  import QWebSettings
 
-from jsinterface import JSInterface
+from .jsinterface import JSInterface
 
 
 class LoggingWebPage(QWebPage):
@@ -27,10 +28,10 @@ def __init__(self, logger=None, parent=None):
 
     def javaScriptConsoleMessage(self, msg, lineNumber, sourceID):
         # don't use the logger for now; too verbose :)
-        print "JsConsole(%s:%d):\n\t%s" % (sourceID, lineNumber, msg)
+        print("JsConsole(%s:%d):\n\t%s" % (sourceID, lineNumber, msg))
 
 
-class SynopticWidget(QtGui.QWidget):
+class SynopticWidget(QtWidgets.QWidget):
 
     """
     A Qt widget displaying a SVG synoptic in a webview.
@@ -50,7 +51,7 @@ def __init__(self, url=None, parent=None, *args, **kwargs):
         self._modelNames = None
 
     def _setup_ui(self, url=None, section=None):
-        self.hbox = hbox = QtGui.QHBoxLayout(self)
+        self.hbox = hbox = QtWidgets.QHBoxLayout(self)
         self.hbox.setContentsMargins(0, 0, 0, 0)
         self.hbox.layout().setContentsMargins(0, 0, 0, 0)
         self.setLayout(self.hbox)
@@ -60,13 +61,13 @@ def _setup_ui(self, url=None, section=None):
     def set_url(self, url, section=None):
         # TODO: probably breaks things if the url is already set
         self._url = url
-        self.splitter = QtGui.QSplitter(self)
+        self.splitter = QtWidgets.QSplitter(self)
         self.splitter.setOrientation(QtCore.Qt.Vertical)
         self.hbox.addWidget(self.splitter)
         view = self._create_view(url, section)
         self._setup_inspector(view)
         self.splitter.addWidget(view)
-        print "set_url", url
+        print("set_url", url)
 
     def setConfig(self, configFile):
         abspath = os.path.dirname(os.path.abspath(configFile))
@@ -110,7 +111,8 @@ def _create_view(self, html=None, section=None):
         # Inject JSInterface into the JS global namespace as "Backend"
         def addBackend():
             frame.addToJavaScriptWindowObject('QtBackend', self.js)
-        view.connect(frame, QtCore.SIGNAL("javaScriptWindowObjectCleared()"), addBackend)
+        #view.connect(frame, QtCore.SIGNAL("javaScriptWindowObjectCleared()"), addBackend)
+        frame.javaScriptWindowObjectCleared.connect(addBackend)
 
         # load the page
         # need to set the "base URL" for the webview to find the
@@ -152,7 +154,7 @@ def toggle_inspector():
                 self._inspector.setPage(page)
                 self.splitter.addWidget(self._inspector)
 
-        shortcut = QtGui.QShortcut(self)
+        shortcut = QtWidgets.QShortcut(self)
         shortcut.setKey(QtCore.Qt.Key_F12)
         shortcut.activated.connect(toggle_inspector)
 
@@ -218,7 +220,7 @@ def select(self, kind, names, replace=True):
         """Set a list of items as 'selected'. By default unselects all
         previously selected things first.
         """
-        print "select", kind, names
+        print("select", kind, names)
         if replace:
             self.js.evaluate("synoptic.unselectAll()")
         if names:
@@ -234,7 +236,7 @@ def unselect_all(self):
 
 if __name__ == '__main__':
     import sys
-    print sys.argv[1]
+    print(sys.argv[1])
     qapp = Qt.QApplication([])
     sw = SynopticWidget(sys.argv[1])
     sw.show()
diff --git a/svgsynoptic2/taurusregistry.py b/svgsynoptic2/taurusregistry.py
index 5aa5a01..7f8bf5c 100755
--- a/svgsynoptic2/taurusregistry.py
+++ b/svgsynoptic2/taurusregistry.py
@@ -1,7 +1,7 @@
 from threading import Lock, Event
 from time import sleep
 
-from PyQt4 import QtCore
+from PyQt5 import QtCore
 from taurus import Attribute
 from taurus.core import TaurusException
 try:
@@ -18,9 +18,9 @@
 
 # We can't use pytango's CaselessDict since it does not keep the original
 # case of the keys :(
-from caseless import CaselessDictionary as CaselessDict
+from .caseless import CaselessDictionary as CaselessDict
 
-from ttldict import TTLDict
+from .ttldict import TTLDict
 
 
 class Registry(QtCore.QThread):
@@ -77,7 +77,7 @@ def subscribe(self, models=[]):
                     try:
                         taurusattrs[modelstate] = Attribute(modelstate)
                     except TaurusException as e:
-                        print "Failed to create Taurus Attribute for model %s! %s" % (model, e)
+                        print("Failed to create Taurus Attribute for model %s! %s" % (model, e))
             elif (self.attribute_validator.isValid(model) or
                     self.eval_validator.isValid(model)):
                 attrs[model] = True
@@ -85,11 +85,11 @@ def subscribe(self, models=[]):
                     try:
                         taurusattrs[model] = Attribute(model)
                     except TaurusException as e:
-                        print "Failed to create Taurus Attribute for model %s! %s" % (model, e)
+                        print("Failed to create Taurus Attribute for model %s! %s" % (model, e))
                     except Exception as e:
-                        print "Failed to create Taurus Attribute for model %s!" % (model)
+                        print("Failed to create Taurus Attribute for model %s!" % (model))
             else:
-                print "Invalid Taurus model %s!?" % model
+                print("Invalid Taurus model %s!?" % model)
         self._attributes = attrs
         self._taurus_attributes = taurusattrs
 
@@ -129,7 +129,7 @@ def _update(self, attributes=CaselessDict()):
             try:
                 self._add_listener(attr)
             except (TypeError, PyTango.DevFailed) as e:
-                print "Failed to setup listener for", attr, e
+                print("Failed to setup listener for", attr, e)
 
         self.unsubscribe_callback(old_attrs)
 
@@ -147,9 +147,9 @@ def _add_listener(self, model):
             listener.addListener(self.handle_event)
             return listener
         except (TaurusException, AttributeError) as e:
-            print "Failed to subscribe to model %s! %s" % (model, e)
+            print("Failed to subscribe to model %s! %s" % (model, e))
         except Exception:
-            print "Failed to subscribe to model %s!" % (model)
+            print("Failed to subscribe to model %s!" % (model))
 
     def _remove_listener(self, model):
         listener = self.listeners.pop(model)
diff --git a/svgsynoptic2/taurussynopticwidget.py b/svgsynoptic2/taurussynopticwidget.py
index 0e57c02..15cb7d0 100755
--- a/svgsynoptic2/taurussynopticwidget.py
+++ b/svgsynoptic2/taurussynopticwidget.py
@@ -6,9 +6,9 @@
 import json
 
 import numpy as np
-from PyQt4 import QtCore
+from PyQt5 import QtCore
 import PyTango
-from synopticwidget import SynopticWidget
+from .synopticwidget import SynopticWidget
 from taurus import Attribute, Manager, Release
 from taurus.core.taurusbasetypes import (
     AttrQuality, TaurusEventType, TaurusSerializationMode)
@@ -47,7 +47,7 @@ def run(self):
                                   % value.value)
             self.finished.emit(self.model, html)
         except PyTango.DevFailed as e:
-            print e
+            print(e)
 
 
 def getStateClasses(state=None):
@@ -110,13 +110,13 @@ def run_plugin_command(self, plugin, cmd, args):
             plugins = __import__("plugins.%s" % plugin, globals(),
                                  locals(), [cmd], -1)
         except ImportError as e:
-            print "Could not initialize plugin '%s'!" % plugin
-            print e
+            print("Could not initialize plugin '%s'!" % plugin)
+            print(e)
             return ""
         return getattr(plugins, cmd)(self, args)
 
     def handle_subscriptions(self, models=[]):
-        print "handle_subscriptions ", models
+        print("handle_subscriptions ", models)
         if self.registry:
             self.registry.subscribe(models)
 
@@ -246,7 +246,7 @@ def on_click(self, kind, name):
         clicked section.  Override this function if you need something
         else.
         """
-        print "on_click", kind, name
+        print("on_click", kind, name)
         if kind == "model" and self.registry.device_validator.isValid(name):
             self.select(kind, [name])
             self.emit(Qt.SIGNAL("graphicItemSelected(QString)"), name)
@@ -269,7 +269,7 @@ def on_rightclick(self, kind, name):
             if name.lower() in self._panels:
 
                 widget = self._panels[name.lower()]
-                print "Found existing panel for %s:" % name, widget
+                print("Found existing panel for %s:" % name, widget)
                 if not widget.isVisible():
                     widget.show()
                 widget.activateWindow()
@@ -305,10 +305,10 @@ def _cleanup_panel(self, w):
         become pretty bogged down."""
         if self.registry:
             with self.registry.lock:
-                print "cleaning up panel for", w.getModel(), "..."
+                print("cleaning up panel for", w.getModel(), "...")
                 self._panels.pop(str(w.getModel()).lower(), None)
                 w.setModel(None)
-                print "done!"
+                print("done!")
 
     # Note: the tooltip stuff is broken and not currently in use.
     # Currently there is only the default tooltip which displays the
@@ -365,13 +365,13 @@ def closeEvent(self, event):
         # not exit cleanly.
         super(TaurusSynopticWidget, self).closeEvent(event)
         for model, panel in self._panels.items():
-            print "closing panel for", model
+            print("closing panel for", model)
             panel.close()
 
 
 if __name__ == '__main__':
     import sys
-    print sys.argv[1]
+    print(sys.argv[1])
     # qapp = Qt.QApplication([])
     app = TaurusApplication()
     sw = TaurusSynopticWidget()