Use new import format.

diff --git a/wrw/__init__.py b/wrw/__init__.py
index aec9825454e552e5ca2de26a8da5efa772deec9e..3a4c91ddfed2ba540d42e7b1cc5f98a5dfa70cc8 100644 (file)
--- 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
-import cookie
-from form import formdata
+from .util import wsgiwrap, persession
+from .dispatch import restart
+from . import cookie
+from .form import formdata

diff --git a/wrw/filesys.py b/wrw/filesys.py
index dcdc8026394ff308c7333546fe904e00261ce439..264cf14b783dd4cea147e42930826e5c58ae9a7f 100644 (file)
--- a/wrw/filesys.py
+++ b/wrw/filesys.py
@@ -1,5 +1,5 @@
 import os
-import resp
+from . import resp
 pj = os.path.join
 
 __all__ = ["filehandler"]

diff --git a/wrw/resp.py b/wrw/resp.py
index 8216d23502d9386b674bb304e36729442b6cf99a..04f3cabe6d5d8d7be055d2b9a985d505cea0310a 100644 (file)
--- a/wrw/resp.py
+++ b/wrw/resp.py
@@ -1,4 +1,4 @@
-import dispatch, proto
+from . import dispatch, proto
 
 __all__ = ["skeleton", "skelfor", "setskel", "usererror"]
 

diff --git a/wrw/session.py b/wrw/session.py
index 2abe650718040207fc43f78b0d520dc7e0327b51..41f2b5d932a75f12c7e0efec4677208f9c675693 100644 (file)
--- a/wrw/session.py
+++ b/wrw/session.py
@@ -1,5 +1,5 @@
 import threading, time, pickle, random, os
-import cookie
+from . import cookie
 
 __all__ = ["db", "get"]
 

diff --git a/wrw/util.py b/wrw/util.py
index 09b9e36cd98ab3ff09f68835c7fe587909e6d5d8..b757e14a724c8f9aec56d568a4bea96b099c90fc 100644 (file)
--- a/wrw/util.py
+++ b/wrw/util.py
@@ -1,4 +1,4 @@
-import req, dispatch, session
+from . import req, dispatch, session
 
 def wsgiwrap(callable):
     def wrapper(env, startreq):

diff --git a/wrw/wmako.py b/wrw/wmako.py
index 9945345552d5e4dc5822bd864096cfc0aa3fdaf2..817233dfeb12f7b4be6e12247759b18465e13cd0 100644 (file)
--- a/wrw/wmako.py
+++ b/wrw/wmako.py
@@ -1,6 +1,6 @@
 import os, threading
 from mako import template, lookup, filters
-import util, form, session
+from . import util, form, session
 
 # It seems Mako isn't thread-safe.
 makolock = threading.Lock()