Skip to content

Unicode utf8 is deprecated #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

Unicode utf8 is deprecated #99

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5bccb00
mock translate and UnicodeUTF8 for PySide2 and PyQt5
Aug 10, 2016
349bed5
provide replacement for UnicodeUTF8 and new static implentation for t…
Aug 10, 2016
56856a0
remove double functino definition (copy and paste error)
Aug 10, 2016
62baab8
Merge branch 'master' into UnicodeUTF8-is-deprecated
Aug 22, 2016
b163772
Merge branch 'master' into UnicodeUTF8-is-deprecated
Aug 22, 2016
af4e8ab
add tests for PyQt5 and PySide2
Aug 22, 2016
4baf70c
add tests for PySide and PyQt4
Aug 22, 2016
1d5d9e0
fix tests
Aug 22, 2016
6324999
fix comment
Aug 22, 2016
bbd1358
move Unicode default to 0 as the call require an int
Aug 22, 2016
cf0f67e
review tests and module
Aug 22, 2016
1f139d6
fix expected argument type
Aug 22, 2016
bbe30b2
restore UnicodeUTF8 to None
Aug 22, 2016
d41d1c4
fix tests and binding for variable type on UnicodeUTF8
Aug 22, 2016
ef23c4b
provide tests for translate results
Aug 22, 2016
102ad28
remove trailing spaces
Aug 25, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
review tests and module
  • Loading branch information
lorenzo angeli committed Aug 22, 2016
commit cf0f67e488686c769941b31dcf9080c8d935894f
19 changes: 10 additions & 9 deletions Qt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

def _pyqt5():
import PyQt5.Qt
from PyQt5 import QtWidgets

# Remap
PyQt5.QtCore.Signal = PyQt5.QtCore.pyqtSignal
Expand All @@ -40,14 +41,14 @@ def _pyqt5():
PyQt5.load_ui = pyqt5_load_ui

# provide mocked UnicodeUTF8 For backward compatibility
PyQt5.QtWidgets.QApplication.UnicodeUTF8 = 0
QtWidgets.QApplication.UnicodeUTF8 = None

old_translate_fn = PyQt5.QtWidgets.QApplication.translate
old_translate_fn = QtWidgets.QApplication.translate

def translate(context, key, disambiguation=None, encoding=0, n=0):
def translate(context, key, disambiguation=None, encoding=None, n=0):
return old_translate_fn(context, key, disambiguation, n)

PyQt5.QtWidgets.QApplication.translate = staticmethod(translate)
QtWidgets.QApplication.translate = staticmethod(translate)

return PyQt5

Expand Down Expand Up @@ -99,7 +100,7 @@ def _pyqt4():

def _pyside2():
import PySide2
from PySide2 import QtGui, QtCore
from PySide2 import QtGui, QtCore, QtWidgets

# Remap
QtCore.QStringListModel = QtGui.QStringListModel
Expand All @@ -112,14 +113,14 @@ def _pyside2():
PySide2.load_ui = pyside2_load_ui

# provide mocked UnicodeUTF8 For backward compatibility
PySide2.QtWidgets.QApplication.UnicodeUTF8 = 0
QtWidgets.QApplication.UnicodeUTF8 = None

old_translate_fn = PySide2.QtWidgets.QApplication.translate
old_translate_fn = QtWidgets.QApplication.translate

def translate(context, key, disambiguation=None, encoding=0, n=0):
def translate(context, key, disambiguation=None, encoding=None, n=0):
return old_translate_fn(context, key, disambiguation, n)

PySide2.QtWidgets.QApplication.translate = staticmethod(translate)
QtWidgets.QApplication.translate = staticmethod(translate)

return PySide2

Expand Down
4 changes: 2 additions & 2 deletions tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ def test_translate_and_UnicodeUTF8_in_pyside2():
from Qt import QtWidgets

# this does not exist in PySide2 by default
assert QtWidgets.QApplication.UnicodeUTF8 is None
assert QtWidgets.QApplication.UnicodeUTF8 is 0

# use patched method with old arguments
QtWidgets.QApplication.translate(
Expand All @@ -270,7 +270,7 @@ def test_translate_and_UnicodeUTF8_in_PyQt5():
from Qt import QtWidgets

# this does not exist in PyQt5 by default
assert QtWidgets.QApplication.UnicodeUTF8 is None
assert QtWidgets.QApplication.UnicodeUTF8 is 0

# use patched method with old arguments
QtWidgets.QApplication.translate(
Expand Down