jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Renato Filho 2011-10-06 11:39:47 -03:00 • committed by Hugo Parente Lima
commit 66a0bbf578
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/QtNetwork/basic_auth_test.py
View file

@ -26,7 +26,7 @@ class testAuthenticationSignal(UsesQCoreApplication):
self.httpd = None self.httpd = None
def onAuthRequest(self, hostname, port, auth): def onAuthRequest(self, hostname, port, auth):
self.assert_(isinstance(auth, QAuthenticator)) self.assertTrue(isinstance(auth, QAuthenticator))
self._resultOk = True self._resultOk = True
self.goAway() self.goAway()
@ -36,7 +36,7 @@ class testAuthenticationSignal(UsesQCoreApplication):
path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/") path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
data = http.get(str(path)) data = http.get(str(path))
self.app.exec_() self.app.exec_()
self.assert_(self._resultOk) self.assertTrue(self._resultOk)
def testwaitSignal2(self): def testwaitSignal2(self):
http = QHttp('127.0.0.1', self.httpd.port()) http = QHttp('127.0.0.1', self.httpd.port())
@ -45,7 +45,7 @@ class testAuthenticationSignal(UsesQCoreApplication):
path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/") path = QUrl.toPercentEncoding("/index.html", "!$&'()*+,;=:@/")
data = http.get(str(path)) data = http.get(str(path))
self.app.exec_() self.app.exec_()
self.assert_(self._resultOk) self.assertTrue(self._resultOk)
if __name__ == '__main__': if __name__ == '__main__':
unittest.main() unittest.main()

12
tests/util/httpd.py
View file

@ -1,10 +1,16 @@
import SocketServer
import BaseHTTPServer
import os import os
import sys import sys
import threading import threading
import select import select
import random import random
import py3kcompat as py3k
if py3k.IS_PY3K:
import socketserver as SocketServer
import http.server as BaseHTTPServer
else:
import SocketServer
import BaseHTTPServer
class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler): class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
DATA = "PySide Server" DATA = "PySide Server"
@ -29,7 +35,7 @@ class TestSecureHandler(BaseHTTPServer.BaseHTTPRequestHandler):
def do_GET(self): def do_GET(self):
self.send_head() self.send_head()
self.wfile.write(TestHandler.DATA) self.wfile.write(py3k.b(TestHandler.DATA))
def do_HEAD(self): def do_HEAD(self):
self.send_head() self.send_head()