From: Fredrik Tolf Date: Fri, 29 Jun 2012 02:35:17 +0000 (+0200) Subject: Merge branch 'master' into python3 X-Git-Url: http://dolda2000.com/gitweb/?p=wrw.git;a=commitdiff_plain;h=6dfbe755cbc3ca1e6af3842d49fb8c6adad4e6c5;hp=ab92e396057cd617b1607f437d860ff89f5780a2 Merge branch 'master' into python3 Conflicts: wrw/__init__.py --- diff --git a/wrw/__init__.py b/wrw/__init__.py index f5a4e91..acf7f64 100644 --- a/wrw/__init__.py +++ b/wrw/__init__.py @@ -1,7 +1,7 @@ __all__ = ["wsgiwrap", "restart", "cookie", "formdata"] from . import proto -from .util import wsgiwrap, stringwrap, formparams, persession, sessiondata, autodirty, manudirty +from .util import wsgiwrap, stringwrap, formparams, persession, sessiondata, autodirty, manudirty, specdirty from .dispatch import restart from . import cookie from .form import formdata