From: Fredrik Tolf Date: Tue, 29 Nov 2011 03:39:56 +0000 (+0100) Subject: Revert "Use new import format." X-Git-Url: http://git.dolda2000.com/gitweb/?a=commitdiff_plain;h=241bc38a0e4d0a33cc885f318f0a5ef6f02c42f0;p=wrw.git Revert "Use new import format." This reverts commit fed807e31c96fef8d941b34a25a1f5044b2d4e8d. --- diff --git a/wrw/__init__.py b/wrw/__init__.py index 3a4c91d..aec9825 100644 --- a/wrw/__init__.py +++ b/wrw/__init__.py @@ -1,6 +1,6 @@ __all__ = ["wsgiwrap", "restart", "cookie", "formdata"] -from .util import wsgiwrap, persession -from .dispatch import restart -from . import cookie -from .form import formdata +from util import wsgiwrap, persession +from dispatch import restart +import cookie +from form import formdata diff --git a/wrw/filesys.py b/wrw/filesys.py index 264cf14..dcdc802 100644 --- a/wrw/filesys.py +++ b/wrw/filesys.py @@ -1,5 +1,5 @@ import os -from . import resp +import resp pj = os.path.join __all__ = ["filehandler"] diff --git a/wrw/resp.py b/wrw/resp.py index 04f3cab..8216d23 100644 --- a/wrw/resp.py +++ b/wrw/resp.py @@ -1,4 +1,4 @@ -from . import dispatch, proto +import dispatch, proto __all__ = ["skeleton", "skelfor", "setskel", "usererror"] diff --git a/wrw/session.py b/wrw/session.py index d088ad7..9e91ad9 100644 --- a/wrw/session.py +++ b/wrw/session.py @@ -1,5 +1,5 @@ import threading, time, pickle, random, os -from . import cookie +import cookie __all__ = ["db", "get"] diff --git a/wrw/util.py b/wrw/util.py index b757e14..09b9e36 100644 --- a/wrw/util.py +++ b/wrw/util.py @@ -1,4 +1,4 @@ -from . import req, dispatch, session +import req, dispatch, session def wsgiwrap(callable): def wrapper(env, startreq): diff --git a/wrw/wmako.py b/wrw/wmako.py index 817233d..9945345 100644 --- a/wrw/wmako.py +++ b/wrw/wmako.py @@ -1,6 +1,6 @@ import os, threading from mako import template, lookup, filters -from . import util, form, session +import util, form, session # It seems Mako isn't thread-safe. makolock = threading.Lock()