From 941c7666875f9a890007858674c3d22ff605e88a Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@tinyerp.com>
Date: Fri, 12 Sep 2008 21:45:04 +0200
Subject: [PATCH] improve the use of release.py
bzr revid: chs@tinyerp.com-20080912194504-yggsuaa992dgekqw
---
bin/openerp-server.py | 6 ------
bin/release.py | 1 +
bin/service/web_services.py | 5 +++--
bin/tools/config.py | 5 +++--
bin/tools/translate.py | 2 +-
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/bin/openerp-server.py b/bin/openerp-server.py
index ef085ffe2c45..55e2e858e9d0 100755
--- a/bin/openerp-server.py
+++ b/bin/openerp-server.py
@@ -41,12 +41,6 @@ import release
__author__ = release.author
__version__ = release.version
-import __builtin__
-__builtin__.__dict__['openerp_version'] = __version__
-__builtin__.__dict__['openerp_version_string'] = "OpenERP Server " + __version__
-
-
-
#----------------------------------------------------------
# python imports
#----------------------------------------------------------
diff --git a/bin/release.py b/bin/release.py
index 6598895b5999..5ef7b184ee04 100644
--- a/bin/release.py
+++ b/bin/release.py
@@ -46,6 +46,7 @@ Programming Language :: Python
url = 'http://www.openerp.com'
author = 'Tiny.be'
author_email = 'info@tiny.be'
+support_email = 'support@openerp.com'
license = 'GPL-2'
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/bin/service/web_services.py b/bin/service/web_services.py
index 2ef2488f6d2a..af2b0256ba60 100644
--- a/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@ -41,6 +41,7 @@ import addons
import sql_db
from tools.translate import _
+import release
logging.basicConfig()
@@ -288,7 +289,7 @@ class db(netsvc.Service):
""" Return the version of the server
Used by the client to verify the compatibility with its own version
"""
- return openerp_version
+ return release.version
db()
class common(netsvc.Service):
@@ -354,7 +355,7 @@ GNU Public Licence.
(c) 2003-TODAY, Fabien Pinckaers - Tiny sprl''')
if extended:
- return info, openerp_version
+ return info, release.version
return info
def timezone_get(self, db, login, password):
diff --git a/bin/tools/config.py b/bin/tools/config.py
index 2f01e409730f..2272199da359 100644
--- a/bin/tools/config.py
+++ b/bin/tools/config.py
@@ -29,7 +29,7 @@
import ConfigParser,optparse,os,sys
import netsvc,logging
-
+import release
class configmanager(object):
def __init__(self, fname=None):
@@ -74,7 +74,8 @@ class configmanager(object):
assert_exit_levels = (netsvc.LOG_CRITICAL, netsvc.LOG_ERROR, netsvc.LOG_WARNING, netsvc.LOG_INFO, netsvc.LOG_DEBUG)
- parser = optparse.OptionParser(version=openerp_version_string)
+ version = "%s %s" % (release.description, release.version)
+ parser = optparse.OptionParser(version=version)
parser.add_option("-c", "--config", dest="config", help="specify alternate config file")
parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.openerp_serverrc")
diff --git a/bin/tools/translate.py b/bin/tools/translate.py
index 623450c8f6ab..28c8667b5692 100644
--- a/bin/tools/translate.py
+++ b/bin/tools/translate.py
@@ -160,7 +160,7 @@ class TinyPoFile(object):
% { 'project': release.description,
'version': release.version,
'modules': reduce(lambda s, m: s + "#\t* %s\n" % m, modules, ""),
- 'bugmail': 'support@openerp.com', #TODO: use variable from release
+ 'bugmail': release.support_email,
'now': mxdt.ISO.strUTC(mxdt.ISO.DateTime.utc()),
}
)
--
GitLab