diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-10-28 17:33:21 +0100 |
| commit | 5bb4fa2b4347a99b5c1a5722d5591c06f7032d4c (patch) | |
| tree | ba5127daf27cc553ebc8683a39b68ebec379f4e9 /addons/auth_signup/controllers/main.py | |
| parent | 0db0f20bda410bd6601c266026363fc95b21c9c4 (diff) | |
| parent | a7ff75f94a168e26b9e9a208167b07d45dc751cb (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131028163321-5o81wa1m7rzdp1dz
Diffstat (limited to 'addons/auth_signup/controllers/main.py')
| -rw-r--r-- | addons/auth_signup/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/auth_signup/controllers/main.py b/addons/auth_signup/controllers/main.py index e42dc64151f..a778cbcf061 100644 --- a/addons/auth_signup/controllers/main.py +++ b/addons/auth_signup/controllers/main.py @@ -21,10 +21,10 @@ import logging import openerp +from openerp import http +from openerp.http import request from openerp.modules.registry import RegistryManager from ..res_users import SignupError -import openerp.addons.web.http as http -from openerp.addons.web.http import request _logger = logging.getLogger(__name__) |