summaryrefslogtreecommitdiffstats
path: root/tests/QtUiTools/uiloader_test.py
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-10-06 11:41:23 -0300
committerRenato Filho <renato.filho@openbossa.org>2011-10-06 15:43:32 -0300
commit6cda8a543d44425c18e8eca3ddbffaf7704eb61d (patch)
tree9342ef1380cbb86d70b7cd932cb759a4e5dc9d6d /tests/QtUiTools/uiloader_test.py
parent98508492aa9b3e9ee1d6e700427a8ab81fd6ea24 (diff)
downloadpyside-6cda8a543d44425c18e8eca3ddbffaf7704eb61d.tar.gz
pyside-6cda8a543d44425c18e8eca3ddbffaf7704eb61d.tar.xz
pyside-6cda8a543d44425c18e8eca3ddbffaf7704eb61d.zip
Updated QtUiTools modue to works with python 2.x and 3.x
Diffstat (limited to 'tests/QtUiTools/uiloader_test.py')
-rw-r--r--tests/QtUiTools/uiloader_test.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/QtUiTools/uiloader_test.py b/tests/QtUiTools/uiloader_test.py
index 0b397a0..09bc5bd 100644
--- a/tests/QtUiTools/uiloader_test.py
+++ b/tests/QtUiTools/uiloader_test.py
@@ -2,8 +2,8 @@ import unittest
import os
from helper import UsesQApplication
-from PySide.QtGui import *
-from PySide.QtUiTools import *
+from PySide.QtGui import QWidget
+from PySide.QtUiTools import QUiLoader
def get_file_path():
for path in file_path:
@@ -26,7 +26,7 @@ class QUioaderTeste(UsesQApplication):
self.assertEqual(w.findChild(QWidget, "grandson_object"), child.findChild(QWidget, "grandson_object"))
def testLoadFileUnicodeFilePath(self):
- filePath = unicode(os.path.join(os.path.dirname(__file__), 'test.ui'))
+ filePath = str(os.path.join(os.path.dirname(__file__), 'test.ui'))
loader = QUiLoader()
parent = QWidget()
w = loader.load(filePath, parent)