rename openerp-web.py to openerp-web

as openerp-server, openerp-client

bzr revid: xavier.manach@xcg-consulting.fr-20111024142543-sottvrs1chqlw0t4

diff --git a/openerp-web b/openerp-web
new file mode 100755 (executable)
index 0000000..fe33585
--- /dev/null
+++ b/openerp-web
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+import optparse
+import os
+import sys
+import json
+import tempfile
+import logging
+import logging.config
+
+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"),
+                     help="directory used for session storage", metavar="DIR")
+optparser.add_option("--server-host", dest="server_host",
+                     default='127.0.0.1', help="OpenERP server hostname", metavar="HOST")
+optparser.add_option("--server-port", dest="server_port", default=8069,
+                     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',
+                    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")
+
+server_options = optparse.OptionGroup(optparser, "Server configuration")
+server_options.add_option("-p", "--port", dest="socket_port", default=8002,
+                          help="listening port", type="int", metavar="NUMBER")
+server_options.add_option('--reloader', dest='reloader',
+                          default=False, action='store_true',
+                          help="Reload application when python files change")
+server_options.add_option('--no-serve-static', dest='serve_static',
+                          default=True, action='store_false',
+                          help="Do not serve static files via this server")
+server_options.add_option('--multi-threaded', dest='threaded',
+                          default=False, action='store_true',
+                          help="Spawn one thread per HTTP request")
+server_options.add_option('--proxy-mode', dest='proxy_mode',
+                          default=False, action='store_true',
+                          help="Enable correct behavior when behind a reverse proxy")
+optparser.add_option_group(server_options)
+
+logging_opts = optparse.OptionGroup(optparser, "Logging")
+logging_opts.add_option("--log-level", dest="log_level", type="choice",
+                        default='debug', help="Global logging level", metavar="LOG_LEVEL",
+                        choices=['debug', 'info', 'warning', 'error', 'critical'])
+logging_opts.add_option("--log-config", dest="log_config", default=os.path.join(os.path.dirname(__file__), "logging.json"),
+                        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:])
+    options.backend =  'xmlrpc'
+
+    os.environ["TZ"] = "UTC"
+
+    if sys.version_info >= (2, 7):
+        with open(options.log_config) as file:
+            dct = json.load(file)
+        logging.config.dictConfig(dct)
+        logging.getLogger("").setLevel(getattr(logging, options.log_level.upper()))
+    else:
+        logging.basicConfig(level=getattr(logging, options.log_level.upper()))
+
+    app = web.common.http.Root(options)
+
+    if options.proxy_mode:
+        app = werkzeug.contrib.fixers.ProxyFix(app)
+
+    werkzeug.serving.run_simple(
+        '0.0.0.0', options.socket_port, app,
+        use_reloader=options.reloader, threaded=options.threaded)
+

diff --git a/openerp-web.py b/openerp-web.py
deleted file mode 100755 (executable)
index fe33585..0000000
--- a/openerp-web.py
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env python
-import optparse
-import os
-import sys
-import json
-import tempfile
-import logging
-import logging.config
-
-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"),
-                     help="directory used for session storage", metavar="DIR")
-optparser.add_option("--server-host", dest="server_host",
-                     default='127.0.0.1', help="OpenERP server hostname", metavar="HOST")
-optparser.add_option("--server-port", dest="server_port", default=8069,
-                     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',
-                    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")
-
-server_options = optparse.OptionGroup(optparser, "Server configuration")
-server_options.add_option("-p", "--port", dest="socket_port", default=8002,
-                          help="listening port", type="int", metavar="NUMBER")
-server_options.add_option('--reloader', dest='reloader',
-                          default=False, action='store_true',
-                          help="Reload application when python files change")
-server_options.add_option('--no-serve-static', dest='serve_static',
-                          default=True, action='store_false',
-                          help="Do not serve static files via this server")
-server_options.add_option('--multi-threaded', dest='threaded',
-                          default=False, action='store_true',
-                          help="Spawn one thread per HTTP request")
-server_options.add_option('--proxy-mode', dest='proxy_mode',
-                          default=False, action='store_true',
-                          help="Enable correct behavior when behind a reverse proxy")
-optparser.add_option_group(server_options)
-
-logging_opts = optparse.OptionGroup(optparser, "Logging")
-logging_opts.add_option("--log-level", dest="log_level", type="choice",
-                        default='debug', help="Global logging level", metavar="LOG_LEVEL",
-                        choices=['debug', 'info', 'warning', 'error', 'critical'])
-logging_opts.add_option("--log-config", dest="log_config", default=os.path.join(os.path.dirname(__file__), "logging.json"),
-                        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:])
-    options.backend =  'xmlrpc'
-
-    os.environ["TZ"] = "UTC"
-
-    if sys.version_info >= (2, 7):
-        with open(options.log_config) as file:
-            dct = json.load(file)
-        logging.config.dictConfig(dct)
-        logging.getLogger("").setLevel(getattr(logging, options.log_level.upper()))
-    else:
-        logging.basicConfig(level=getattr(logging, options.log_level.upper()))
-
-    app = web.common.http.Root(options)
-
-    if options.proxy_mode:
-        app = werkzeug.contrib.fixers.ProxyFix(app)
-
-    werkzeug.serving.run_simple(
-        '0.0.0.0', options.socket_port, app,
-        use_reloader=options.reloader, threaded=options.threaded)
-

diff --git a/setup.py b/setup.py
index 2240497..3f10868 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ setup(
         'Environment :: Web Environment',
         'Topic :: Office/Business :: Financial',
         ],
-    scripts=['openerp-web.py'],
+    scripts=['openerp-web'],
     data_files=(find_data_files('addons')
               + opts.pop('data_files', [])
     ),