Skip to content

Commit bc6aa7c

Browse files
authored
Merge pull request #203 from mikrosimage/1.0.0.b4.mikros.0.1
_convert: fix conversion of compiled .ui to Qt.py when QtCompat.translate is called
2 parents 791668b + 06773f7 commit bc6aa7c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Qt.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -950,9 +950,9 @@ def _convert(lines):
950950
"""
951951

952952
def parse(line):
953-
line = line.replace("from PySide2 import", "from Qt import")
953+
line = line.replace("from PySide2 import", "from Qt import QtCompat,")
954954
line = line.replace("QtWidgets.QApplication.translate",
955-
"Qt.QtCompat.translate")
955+
"QtCompat.translate")
956956
return line
957957

958958
parsed = list()

tests.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,15 @@ def retranslateUi(self, uic):
284284
""".split("\n")
285285

286286
after = """\
287-
from Qt import QtCore, QtGui, QtWidgets
287+
from Qt import QtCompat, QtCore, QtGui, QtWidgets
288288
289289
class Ui_uic(object):
290290
def setupUi(self, uic):
291291
self.retranslateUi(uic)
292292
293293
def retranslateUi(self, uic):
294294
self.pushButton_2.setText(
295-
Qt.QtCompat.translate("uic", "NOT Ok", None, -1))
295+
QtCompat.translate("uic", "NOT Ok", None, -1))
296296
""".split("\n")
297297

298298
from Qt import QtCompat
@@ -314,15 +314,15 @@ def retranslateUi(self, uic):
314314
"""
315315

316316
after = """\
317-
from Qt import QtCore, QtGui, QtWidgets
317+
from Qt import QtCompat, QtCore, QtGui, QtWidgets
318318
319319
class Ui_uic(object):
320320
def setupUi(self, uic):
321321
self.retranslateUi(uic)
322322
323323
def retranslateUi(self, uic):
324324
self.pushButton_2.setText(
325-
Qt.QtCompat.translate("uic", "NOT Ok", None, -1))
325+
QtCompat.translate("uic", "NOT Ok", None, -1))
326326
"""
327327

328328
fname = os.path.join(self.tempdir, "idempotency.py")

0 commit comments

Comments
 (0)