Use new import format.

diff --git a/wrw/__init__.py b/wrw/__init__.py
index aec9825..3a4c91d 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 dcdc802..264cf14 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 8216d23..04f3cab 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 9e91ad9..d088ad7 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 09b9e36..b757e14 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 9945345..817233d 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()