aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/tests/QtCore/qsettings_test.py
diff options
context:
space:
mode:
authorCristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2020-03-30 10:07:56 +0200
committerCristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2020-03-30 10:07:56 +0200
commitd2be09eef06241cd4c9eb7a0ca1a993dc2355f02 (patch)
tree4cd15a74c0629e76a41b30d2e02d22e998fb509d /sources/pyside2/tests/QtCore/qsettings_test.py
parentad73193e99fef8f5d1bcf095075596dca88949c1 (diff)
parentd47fb98e443e3ac5cb18850b2551143c713917f0 (diff)
Merge branch '5.14' into 5.14.2v5.14.2
Diffstat (limited to 'sources/pyside2/tests/QtCore/qsettings_test.py')
-rw-r--r--sources/pyside2/tests/QtCore/qsettings_test.py5
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)