Fixed erroneous merge.

[wrw.git] / wrw / __init__.py

diff --git a/wrw/__init__.py b/wrw/__init__.py
index 8cc06b1..95ff4cd 100644 (file)
--- a/wrw/__init__.py
+++ b/wrw/__init__.py
@@ -1,6 +1,7 @@
 __all__ = ["wsgiwrap", "restart", "cookie", "formdata"]
 
-from .util import wsgiwrap, persession, sessiondata
-from .dispatch import restart
-from . import cookie
-from .form import formdata
+import proto
+from util import wsgiwrap, formparams, funplex, persession, sessiondata, autodirty, manudirty, specdirty
+from dispatch import restart
+import cookie
+from form import formdata