[py-svn] r39975 - in py/trunk/py/net: pipe server
fijal at codespeak.net
fijal at codespeak.net
Tue Mar 6 10:49:48 CET 2007
Author: fijal
Date: Tue Mar 6 10:49:47 2007
New Revision: 39975
Modified:
py/trunk/py/net/pipe/common.py
py/trunk/py/net/pipe/gsocket.py
py/trunk/py/net/pipe/mp.py
py/trunk/py/net/server/httpserver.py
Log:
Fix imports
Modified: py/trunk/py/net/pipe/common.py
==============================================================================
--- py/trunk/py/net/pipe/common.py (original)
+++ py/trunk/py/net/pipe/common.py Tue Mar 6 10:49:47 2007
@@ -1,6 +1,14 @@
-import greensock2
-from pypeers.tool import log
+from py.__.net import greensock2
+VERBOSE = True
+
+
+if VERBOSE:
+ def log(msg, *args):
+ print '*', msg % args
+else:
+ def log(msg, *args):
+ pass
class BufferedInput(object):
in_buf = ''
Modified: py/trunk/py/net/pipe/gsocket.py
==============================================================================
--- py/trunk/py/net/pipe/gsocket.py (original)
+++ py/trunk/py/net/pipe/gsocket.py Tue Mar 6 10:49:47 2007
@@ -1,4 +1,4 @@
-import greensock2
+from py.__.net import greensock2
import socket, errno, os
error = socket.error
Modified: py/trunk/py/net/pipe/mp.py
==============================================================================
--- py/trunk/py/net/pipe/mp.py (original)
+++ py/trunk/py/net/pipe/mp.py Tue Mar 6 10:49:47 2007
@@ -1,4 +1,4 @@
-from pypeers.stream.common import BufferedInput
+from py.__.net.pipe.common import BufferedInput
class MeetingPointInput(BufferedInput):
Modified: py/trunk/py/net/server/httpserver.py
==============================================================================
--- py/trunk/py/net/server/httpserver.py (original)
+++ py/trunk/py/net/server/httpserver.py Tue Mar 6 10:49:47 2007
@@ -1,6 +1,6 @@
import BaseHTTPServer
-from pypeers import greensock2
-from pypeers.pipe.gsocket import GreenSocket
+from py.__.net import greensock2
+from py.__.net.pipe.gsocket import GreenSocket
class GreenMixIn:
More information about the pytest-commit
mailing list