From: Fredrik Tolf <fredrik@dolda2000.com>
Date: Fri, 30 Dec 2011 01:34:20 +0000 (+0100)
Subject: Merge branch 'master' into python3
X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=ca6fd155fd1cf58241c9d136977c2fd08948b51b

Merge branch 'master' into python3

Conflicts:
	wrw/__init__.py
	wrw/util.py
---

ca6fd155fd1cf58241c9d136977c2fd08948b51b
diff --cc wrw/__init__.py
index 8cc06b1,c0b8273..d4b0a63
--- a/wrw/__init__.py
+++ b/wrw/__init__.py
@@@ -1,6 -1,6 +1,6 @@@
  __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
  
- from .util import wsgiwrap, persession, sessiondata
 -from util import wsgiwrap, formparams, persession, sessiondata, autodirty, manudirty
 -from dispatch import restart
 -import cookie
 -from form import formdata
++from .util import wsgiwrap, formparams, persession, sessiondata, autodirty, manudirty
 +from .dispatch import restart
 +from . import cookie
 +from .form import formdata
diff --cc wrw/util.py
index 1c2ed6f,7a29ea8..35cd3ae
--- a/wrw/util.py
+++ b/wrw/util.py
@@@ -1,4 -1,5 +1,5 @@@
- from . import req, dispatch, session
+ import inspect
 -import req, dispatch, session, form
++from . import req, dispatch, session, form
  
  def wsgiwrap(callable):
      def wrapper(env, startreq):