[pypy-svn] r28583 - pypy/dist/pypy/translator/js2/proxy/testme
ericvrp at codespeak.net
ericvrp at codespeak.net
Fri Jun 9 14:30:54 CEST 2006
Author: ericvrp
Date: Fri Jun 9 14:30:52 2006
New Revision: 28583
Modified:
pypy/dist/pypy/translator/js2/proxy/testme/controllers.py
Log:
Remove hardcoding of BnB server port
Modified: pypy/dist/pypy/translator/js2/proxy/testme/controllers.py
==============================================================================
--- pypy/dist/pypy/translator/js2/proxy/testme/controllers.py (original)
+++ pypy/dist/pypy/translator/js2/proxy/testme/controllers.py Fri Jun 9 14:30:52 2006
@@ -5,6 +5,8 @@
import PIL.Image
import zlib
import socket
+import urllib
+import re
class SessionData:
@@ -72,14 +74,13 @@
class Root(controllers.Root):
- host = 'localhost'
- port = 32819 #XXX automate this
- size = 1024
-
- #data
_sessionData = {}
n_header_lines = 2
+ host = 'localhost'
+ port = re.findall('value=".*"', urllib.urlopen('http://%s:8000' % host).read())[0]
+ port = int(port[7:-1])
+
def sessionData(self):
session = cherrypy.session
sessionid = session['_id']
@@ -105,7 +106,8 @@
def recv(self):
#XXX hangs if not first sending a ping!
d = self.sessionData()
- data = d.data + self.sessionSocket().recv(self.size)
+ size = 1024
+ data = d.data + self.sessionSocket().recv(size)
while self.n_header_lines > 0 and '\n' in data:
self.n_header_lines -= 1
header_line, data = data.split('\n',1)
More information about the Pypy-commit
mailing list