py2 compatibility fixes

nxt-dev · Feb 9, 2021 · 809335c · 809335c
1 parent 846e6aa
commit 809335c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/nxt_editor/dockwidgets/code_editor.py b/nxt_editor/dockwidgets/code_editor.py
@@ -1303,9 +1303,8 @@ def paintEvent(self, event):
         # Draw center message text
         msg_offset = font_metrics.boundingRect(self.click_msg).width()
         msg_offset += painter.font().pointSize()
-        pos = (self.rect().center().x() - (msg_offset*.5),
-               self.rect().center().y())
-        painter.drawText(*pos, self.click_msg)
+        painter.drawText(self.rect().center().x() - (msg_offset*.5),
+                         self.rect().center().y(), self.click_msg)
         painter.setCompositionMode(QtGui.QPainter.CompositionMode_Darken)
         path = QtGui.QPainterPath()
         path.addRoundedRect(QtCore.QRectF(self.rect()), 9, 9)

diff --git a/nxt_editor/dockwidgets/widget_builder.py b/nxt_editor/dockwidgets/widget_builder.py
@@ -1,7 +1,10 @@
 # Built-in
 import logging
 import ast
-import collections.abc
+try:
+    from collections.abc import Iterable
+except ImportError:
+    from collections import Iterable
 
 # External
 from Qt import QtWidgets