diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-16 13:45:11 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-04-16 13:45:11 +0200 |
commit | c121c29952f3070e110dc9a9c86bf5fd41c14d92 (patch) | |
tree | 8bf68b6d179ec34b7b85dc76b09945bbf775e562 /sources/pyside2/tests/QtCore/qsettings_test.py | |
parent | 3895f0b107ff27aea4eefe390271b176e3af73b7 (diff) | |
parent | 8df43d8c9d704a3abcc58b8ba84fc6fbfee2c433 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: I1c48ecc24ff07e760415cea1d7ed512a99c838a1
Diffstat (limited to 'sources/pyside2/tests/QtCore/qsettings_test.py')
-rw-r--r-- | sources/pyside2/tests/QtCore/qsettings_test.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sources/pyside2/tests/QtCore/qsettings_test.py b/sources/pyside2/tests/QtCore/qsettings_test.py index 982ddc38d..639f6d276 100644 --- a/sources/pyside2/tests/QtCore/qsettings_test.py +++ b/sources/pyside2/tests/QtCore/qsettings_test.py @@ -75,10 +75,7 @@ class TestQSettings(unittest.TestCase): # Handling zero value r = settings.value('zero_value') - if py3k.IS_PY3K: - self.assertEqual(type(r), int) - else: - self.assertEqual(type(r), long) + self.assertEqual(type(r), int) r = settings.value('zero_value', type=int) self.assertEqual(type(r), int) |