From da26d914c882f95fe2fd7a0cdc876d6383fbb12a Mon Sep 17 00:00:00 2001 From: fijal Date: Tue, 6 Mar 2007 10:49:47 +0100 Subject: [PATCH] [svn r39975] Fix imports --HG-- branch : trunk --- py/net/pipe/common.py | 12 ++++++++++-- py/net/pipe/gsocket.py | 2 +- py/net/pipe/mp.py | 2 +- py/net/server/httpserver.py | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/py/net/pipe/common.py b/py/net/pipe/common.py index 7a17fb890..ba0aa7a29 100644 --- a/py/net/pipe/common.py +++ b/py/net/pipe/common.py @@ -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 = '' diff --git a/py/net/pipe/gsocket.py b/py/net/pipe/gsocket.py index 4a2d9e05e..a3f6d7e20 100644 --- a/py/net/pipe/gsocket.py +++ b/py/net/pipe/gsocket.py @@ -1,4 +1,4 @@ -import greensock2 +from py.__.net import greensock2 import socket, errno, os error = socket.error diff --git a/py/net/pipe/mp.py b/py/net/pipe/mp.py index cfc9c13c7..f67171681 100644 --- a/py/net/pipe/mp.py +++ b/py/net/pipe/mp.py @@ -1,4 +1,4 @@ -from pypeers.stream.common import BufferedInput +from py.__.net.pipe.common import BufferedInput class MeetingPointInput(BufferedInput): diff --git a/py/net/server/httpserver.py b/py/net/server/httpserver.py index e0f2dbf21..57c55d8a9 100644 --- a/py/net/server/httpserver.py +++ b/py/net/server/httpserver.py @@ -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: