Merge lp:~xavinsky/openerp-web/trunk-web-xma into lp:openerp-web

[xavinsky]

  Installation openerp with

python setup.py install
In Debian wheezy didn't works for a lot of details.
I tried to fix it with this branch.

fix 1 : packages list with find_packages() in setup.py
Bug : 876308

fix 2 : script name error : scripts=['openerp-web']

rename 1 : openerp-web.py => openerp-web
for coherence script name (openerp-server openerp-client)

fix 3 : default missing options.log_config in openerp-web

fix 4 : change sys.path.insert with addons path.

  First try merge in another branch was review by Xavier.
In this new branch I try to fix better the problems.

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Merging it with just two small modifications:

* Removed the first `raise`, I'll let the second one handle the error
* Used `OptionParser.error`[0] instead of a string raise, as I'm not fond of string raises and it seemed a better fit

Thanks.

[0] http://docs.python.org/library/optparse.html#how-optparse-handles-errors

review: Approve

[xavinsky (xavinsky)]

Hi Xavier.

  Thanks for merged it.
What about this branch now.
I can remove it ?

[Xavier (Open ERP) (xmo-deactivatedaccount)]

No need, Launchpad marked it as merged, so it's not visible from the main view. It can stay for historical purposes, we leave ours there, they don't bother anybody.

=== renamed file 'openerp-web.py' => 'openerp-web'
--- openerp-web.py	2011-10-05 17:58:26 +0000
+++ openerp-web	2011-10-24 15:46:23 +0000
@@ -10,11 +10,6 @@
 import werkzeug.serving
 import werkzeug.contrib.fixers
 
-path_root = os.path.dirname(os.path.abspath(__file__))
-path_addons = os.path.join(path_root, 'addons')
-if path_addons not in sys.path:
-    sys.path.insert(0, path_addons)
-
 optparser = optparse.OptionParser()
 optparser.add_option("-s", "--session-path", dest="session_storage",
                      default=os.path.join(tempfile.gettempdir(), "oe-sessions"),
@@ -25,7 +20,7 @@
                      help="OpenERP server port", type="int", metavar="NUMBER")
 optparser.add_option("--db-filter", dest="dbfilter", default='.*',
                      help="Filter listed database", metavar="REGEXP")
-optparser.add_option('--addons-path', dest='addons_path', default=[path_addons], action='append',
+optparser.add_option('--addons-path', dest='addons_path', default=[], action='append',
                     help="Path do addons directory", metavar="PATH")
 optparser.add_option('--load', dest='server_wide_modules', default=['web'], action='append',
                     help="Load a additional module before login (by default only 'web' is loaded)", metavar="MODULE")
@@ -55,15 +50,44 @@
                         help="Logging configuration file", metavar="FILE")
 optparser.add_option_group(logging_opts)
 
-import web.common.http
 
 if __name__ == "__main__":
     (options, args) = optparser.parse_args(sys.argv[1:])
+
+    if not options.addons_path:
+        path_root = os.path.dirname(os.path.abspath(__file__))
+        path_addons = os.path.join(path_root, 'addons')
+        if os.path.exists(path_addons):
+            options.addons_path.append(path_addons)
+
+    def remove_end_slash(text):
+        if text[-1] in '/\\':
+            return text[:-1]
+        return text
+
+    def drop_false_path(path):
+        if os.path.exists(path):
+            return True
+
+    options.addons_path = map(remove_end_slash, options.addons_path)
+    options.addons_path = filter(drop_false_path, options.addons_path)
+
+    if not options.addons_path:
+        raise('Error Importing web modules. Missing or incorrect --addons-path ')
+
+    for path_addons in options.addons_path:
+        if path_addons not in sys.path:
+            sys.path.insert(0, path_addons)
+
+    try:
+        import web.common.http
+    except:
+        raise('Error Importing web modules. addons_path must be wrong.')
+
     options.backend =  'xmlrpc'
-
     os.environ["TZ"] = "UTC"
 
-    if sys.version_info >= (2, 7):
+    if sys.version_info >= (2, 7) and os.path.exists(options.log_config):
         with open(options.log_config) as file:
             dct = json.load(file)
         logging.config.dictConfig(dct)

=== modified file 'setup.py'
--- setup.py	2011-09-13 07:12:05 +0000
+++ setup.py	2011-10-24 15:46:23 +0000
@@ -2,7 +2,7 @@
 import os
 import re
 import sys
-from setuptools import setup
+from setuptools import setup, find_packages
 
 execfile('addons/web/common/release.py')
 
@@ -57,14 +57,7 @@
     ],
     test_suite = 'unittest2.collector',
     zip_safe=False,
-    packages=[
-        'addons',
-        'addons.base',
-        'addons.base.controllers',
-        'addons.base_calendar',
-        'addons.base_hello',
-        'openerpweb',
-    ],
+    packages=find_packages(),
     classifiers=[
         'Development Status :: 6 - Production/Stable',
         'Operating System :: OS Independent',
@@ -72,7 +65,7 @@
         'Environment :: Web Environment',
         'Topic :: Office/Business :: Financial',
         ],
-    scripts=['scripts/openerp-web'],
+    scripts=['openerp-web'],
     data_files=(find_data_files('addons')
               + opts.pop('data_files', [])
     ),