summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-09-11 15:24:46 +0200
committerXavier Morel <xmo@openerp.com>2012-09-11 15:24:46 +0200
commit9b0f10af1231a622ae79b0b97d26cd2af73891b4 (patch)
treeb8d41cc2d0d99ae38553388eb1d2b7e79f11b355 /addons
parent7d0ea14778e35b1e844ddb3f3969745a9090d662 (diff)
[FIX] base_import: just loading module should not require unittest2. Reported by M.Taylor
bzr revid: xmo@openerp.com-20120911132446-u1yd48tsfd7km6hn
Diffstat (limited to 'addons')
-rw-r--r--addons/base_import/__init__.py2
-rw-r--r--addons/base_import/test_models.py (renamed from addons/base_import/tests/models.py)0
2 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_import/__init__.py b/addons/base_import/__init__.py
index ab0a528f1f1..939a8173e38 100644
--- a/addons/base_import/__init__.py
+++ b/addons/base_import/__init__.py
@@ -1,3 +1,3 @@
import controllers
import models
-import tests.models
+import test_models
diff --git a/addons/base_import/tests/models.py b/addons/base_import/test_models.py
index 0720ae11eda..0720ae11eda 100644
--- a/addons/base_import/tests/models.py
+++ b/addons/base_import/test_models.py