Merge lp:~openerp-dev/openobject-server/7.0-import-non-local-warning-mat into lp:openobject-server/7.0

[Martin Trigaux (OpenERP)]

Avoiding to get the warning message when importing the python module 'resource'.

Way to reproduce:
- launch openerp with --workers=1
-> get WARNING ? openerp.modules.module:
Ambiguous import: the OpenERP module `resource` is shadowed by another
module (available at /usr/lib/python2.7/lib-dynload/resource.so).
To import it, use `import openerp.addons.<module>.`.

Probably a bit overkill, not sure we should merge that...

Another way would be to simply reduce the log level to 'debug'

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Why would import openerp.addons.resource not work ?

review: Needs Information

[Martin Trigaux (OpenERP) (mat-openerp)]

What do you mean by "not work". As far as I know, it currently works fine, just displaying a non-harmful message. My patch gives you a way to remove this warning in the workers.

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Yes sorry, I mean would it not remove the warning too?

[Martin Trigaux (OpenERP) (mat-openerp)]

This would mean than, when importing resource, meaning <the python resource module>, you can use the code:

import openerp.tools.misc as misc
resource = misc.import_non_local('resource')

And it will have the same effect without showing warning message.
When you want to import the openerp module, you still need to use the `import openerp.addons.resource` syntax

[Lionel Sausin - Initiatives/Numérigraphe (ls-initiatives)]

Ok I get it now, thanks.

Unmerged revisions

5257. By Martin Trigaux (OpenERP) on 2014-03-10

[IMP] import resource (python module) in a way we avoid triggering the warning (name clash with module resource)

=== modified file 'openerp/service/workers.py'
--- openerp/service/workers.py	2013-07-24 08:34:54 +0000
+++ openerp/service/workers.py	2014-03-11 13:26:39 +0000
@@ -8,7 +8,6 @@
 import os
 import psutil
 import random
-import resource
 import select
 import signal
 import socket
@@ -23,6 +22,8 @@
 
 import openerp
 import openerp.tools.config as config
+import openerp.tools.misc as misc
+resource = misc.import_non_local('resource')
 
 _logger = logging.getLogger(__name__)
 

=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py	2013-11-25 08:42:15 +0000
+++ openerp/tools/misc.py	2014-03-11 13:26:39 +0000
@@ -30,6 +30,7 @@
 import cProfile
 import subprocess
 import logging
+import imp
 import os
 import socket
 import sys
@@ -1095,4 +1096,11 @@
 
     return [x for i, x in enumerate(args) if not strip(args, i)]
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+def import_non_local(name, custom_name=None):
+    custom_name = custom_name or name
+
+    f, pathname, desc = imp.find_module(name, sys.path[1:])
+    module = imp.load_module(custom_name, f, pathname, desc)
+    f.close()
+
+    return module