diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:41:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-07-03 14:51:45 +0200 |
commit | d850748283698596327653ec30decdbd6c964af8 (patch) | |
tree | 6efc71e7877294fb616f88f1f17f089d4dce1b84 /sources/pyside2/tests/QtCore/qtimezone_test.py | |
parent | 46ff21ee14e00b992b49562943274d62f2b5b456 (diff) | |
parent | ffae5fe2f3312fdad7ef5880308dae4fd31fec94 (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib2eeca97ebabcff53ef7ddd9fc769be6424db39f
Diffstat (limited to 'sources/pyside2/tests/QtCore/qtimezone_test.py')
-rw-r--r-- | sources/pyside2/tests/QtCore/qtimezone_test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sources/pyside2/tests/QtCore/qtimezone_test.py b/sources/pyside2/tests/QtCore/qtimezone_test.py index fb1326e53..3d5bd1714 100644 --- a/sources/pyside2/tests/QtCore/qtimezone_test.py +++ b/sources/pyside2/tests/QtCore/qtimezone_test.py @@ -29,10 +29,11 @@ import unittest from PySide2.QtCore import QTimeZone +import py3kcompat as py3k class TestQTimeZone (unittest.TestCase): def testTimeZone(self): - id = 'Europe/Berlin' + id = py3k.b('Europe/Berlin') timeZone = QTimeZone(id) self.assertTrue(timeZone.isValid()) self.assertEqual(timeZone.id(), id) |