Updated QtWebKit modue to works with python 2.x and 3.x

2 files changed, 12 insertions, 14 deletions

diff --git a/tests/QtWebKit/bug_959.py b/tests/QtWebKit/bug_959.py
index c4e53c7f9..3f40c9a68 100644
--- a/tests/QtWebKit/bug_959.py
+++ b/tests/QtWebKit/bug_959.py
@@ -1,40 +1,40 @@
 from PySide.QtCore import QObject, Slot, QTimer

-from PySide.QtWebKit import QWebView, QWebPage

+from PySide.QtWebKit import QWebView

 

 import unittest

 from helper import UsesQApplication

 

 class JSFuncs(QObject):

     functionID = -1

-    @Slot(unicode,result=unicode)

+    @Slot(str,result=str)

     def slot_str_str(self, x):

         JSFuncs.functionID = 0

         return x.upper()

 

-    @Slot(unicode,result='QVariant')

+    @Slot(str,result='QVariant')

     def slot_str_list(self, x):

         JSFuncs.functionID = 1

         return [x, x]

 

-    @Slot('QStringList',result=unicode)

+    @Slot('QStringList',result=str)

     def slot_strlist_str(self, x):

         JSFuncs.functionID = 2

         return x[-1]

 

-    @Slot('QVariant',result=unicode)

+    @Slot('QVariant',result=str)

     def slot_variant_str(self, x):

         JSFuncs.functionID = 3

-        return unicode(x)

+        return str(x)

 

-    @Slot('QVariantList',result=unicode)

+    @Slot('QVariantList',result=str)

     def slot_variantlist_str(self, x):

         JSFuncs.functionID = 4

-        return unicode(x[-1])

+        return str(x[-1])

 

-    @Slot('QVariantMap',result=unicode)

+    @Slot('QVariantMap',result=str)

     def slot_variantmap_str(self, x):

         JSFuncs.functionID = 5

-        return unicode(x["foo"])

+        return str(x["foo"])

 

 

 

diff --git a/tests/QtWebKit/webview_test.py b/tests/QtWebKit/webview_test.py
index ab81a306e..591d07242 100644
--- a/tests/QtWebKit/webview_test.py
+++ b/tests/QtWebKit/webview_test.py
@@ -2,10 +2,11 @@
 '''Test cases for QWebView'''
 
 import unittest
+import py3kcompat as py3k
 import sys
 
 from PySide.QtCore import QObject, SIGNAL, QUrl
-from PySide.QtWebKit import *
+from PySide.QtWebKit import QWebPage, QWebView
 from PySide.QtNetwork import QNetworkRequest
 
 from helper import adjust_filename, TimedQApplication
@@ -62,8 +63,5 @@ class TestLoadFinished(TimedQApplication):
         if ok:
             self.called = True
 
-    def testNamedArgumentTypeChecking(self):
-        self.assertRaises(TypeError, self.view.load, QNetworkRequest(), body=unicode('foo'))
-
 if __name__ == '__main__':
     unittest.main()