From d54ab2c911e098b4fded42b7ae018fc4f2665d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 17 Jan 2008 23:30:46 +0100 Subject: [PATCH] Remove more terp references (from Brice) --- .hgignore | 4 +- trytond/config.py | 8 +-- trytond/ir/{__terp__.py => __tryton__.py} | 0 trytond/ir/actions.xml | 4 +- trytond/ir/attachment.xml | 4 +- trytond/ir/cron.xml | 4 +- trytond/ir/exports.xml | 4 +- trytond/ir/ir.xml | 4 +- trytond/ir/model.xml | 4 +- trytond/ir/module/category.xml | 4 +- trytond/ir/module/module.py | 62 +++++++++--------- trytond/ir/module/module.xml | 4 +- trytond/ir/module/repository.xml | 4 +- trytond/ir/property.xml | 4 +- trytond/ir/rule.xml | 4 +- trytond/ir/sequence.xml | 4 +- trytond/ir/translation.xml | 4 +- trytond/ir/ui/menu.xml | 4 +- trytond/ir/ui/ui.xml | 4 +- trytond/ir/ui/view.xml | 4 +- trytond/ir/values.xml | 4 +- trytond/module.py | 10 +-- trytond/res/{__terp__.py => __tryton__.py} | 0 trytond/res/lang.xml | 4 +- trytond/res/report/user.odt | Bin 0 -> 7696 bytes trytond/res/request.xml | 4 +- trytond/res/res.xml | 4 +- trytond/res/users.xml | 4 +- trytond/sql_db.py | 10 +-- trytond/tools/convert.py | 4 +- .../workflow/{__terp__.py => __tryton__.py} | 0 trytond/workflow/workflow.xml | 4 +- 32 files changed, 94 insertions(+), 92 deletions(-) rename trytond/ir/{__terp__.py => __tryton__.py} (100%) rename trytond/res/{__terp__.py => __tryton__.py} (100%) create mode 100644 trytond/res/report/user.odt rename trytond/workflow/{__terp__.py => __tryton__.py} (100%) diff --git a/.hgignore b/.hgignore index 05eeec70d0..2e6331fd7e 100644 --- a/.hgignore +++ b/.hgignore @@ -1,4 +1,6 @@ syntax: glob .hgignore *.pyc -*~ \ No newline at end of file +*~ +addons/* +trytond.conf diff --git a/trytond/config.py b/trytond/config.py index eff831c265..e468671caf 100644 --- a/trytond/config.py +++ b/trytond/config.py @@ -50,7 +50,7 @@ class ConfigManager(object): 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 ~/.terp_serverrc") + default=False, help="save configuration to ~/.trytondrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") parser.add_option("--pidfile", dest="pidfile", @@ -125,12 +125,12 @@ class ConfigManager(object): # or even to start the server... if os.name == 'nt': rcfilepath = os.path.join(os.path.abspath( - os.path.dirname(sys.argv[0])), 'tinyerp-server.conf') + os.path.dirname(sys.argv[0])), 'tryton-server.conf') else: - rcfilepath = os.path.expanduser('~/.terp_serverrc') + rcfilepath = os.path.expanduser('~/.trytondrc') self.rcfile = fname or opt.config \ - or os.environ.get('TERP_SERVER') or rcfilepath + or os.environ.get('TRYTOND') or rcfilepath self.load() # Verify that we want to log or not, if not the output will go to stdout diff --git a/trytond/ir/__terp__.py b/trytond/ir/__tryton__.py similarity index 100% rename from trytond/ir/__terp__.py rename to trytond/ir/__tryton__.py diff --git a/trytond/ir/actions.xml b/trytond/ir/actions.xml index 62ff273969..54df963dcf 100644 --- a/trytond/ir/actions.xml +++ b/trytond/ir/actions.xml @@ -1,5 +1,5 @@ - + @@ -245,4 +245,4 @@ - + diff --git a/trytond/ir/attachment.xml b/trytond/ir/attachment.xml index 05e7482258..97bb07810e 100644 --- a/trytond/ir/attachment.xml +++ b/trytond/ir/attachment.xml @@ -1,5 +1,5 @@ - + ir.attachment @@ -53,4 +53,4 @@ - + diff --git a/trytond/ir/cron.xml b/trytond/ir/cron.xml index d5eec554fe..eeb437a02f 100644 --- a/trytond/ir/cron.xml +++ b/trytond/ir/cron.xml @@ -1,5 +1,5 @@ - + ir.cron @@ -63,4 +63,4 @@ - + diff --git a/trytond/ir/exports.xml b/trytond/ir/exports.xml index c5cbf1108e..6815936e65 100644 --- a/trytond/ir/exports.xml +++ b/trytond/ir/exports.xml @@ -1,5 +1,5 @@ - + ir.exports @@ -47,4 +47,4 @@ - + diff --git a/trytond/ir/ir.xml b/trytond/ir/ir.xml index 057da56bf9..8fce1df812 100644 --- a/trytond/ir/ir.xml +++ b/trytond/ir/ir.xml @@ -1,7 +1,7 @@ - + - + diff --git a/trytond/ir/model.xml b/trytond/ir/model.xml index c678beea70..755d869100 100644 --- a/trytond/ir/model.xml +++ b/trytond/ir/model.xml @@ -1,5 +1,5 @@ - + ir.model @@ -153,4 +153,4 @@ action="act_model_access_form" id="menu_model_access_form"/> - + diff --git a/trytond/ir/module/category.xml b/trytond/ir/module/category.xml index 4c09f7f3c5..6629353189 100644 --- a/trytond/ir/module/category.xml +++ b/trytond/ir/module/category.xml @@ -1,5 +1,5 @@ - + ir.module.category @@ -41,4 +41,4 @@ - + diff --git a/trytond/ir/module/module.py b/trytond/ir/module/module.py index d0c8c00719..2493ce998b 100644 --- a/trytond/ir/module/module.py +++ b/trytond/ir/module/module.py @@ -128,10 +128,10 @@ class Module(OSV): @staticmethod def get_module_info(name): - "Return the content of the __terp__.py" + "Return the content of the __tryton__.py" try: file_p = tools.file_open(os.path.join(ADDONS_PATH, name, - '__terp__.py')) + '__tryton__.py')) data = file_p.read() info = eval(data) file_p.close() @@ -320,36 +320,36 @@ class Module(OSV): if ids: module_id = ids[0] mod = self.browse(cursor, user, module_id) - terp = Module.get_module_info(mod_name) - if terp.get('installable', True) \ + tryton = Module.get_module_info(mod_name) + if tryton.get('installable', True) \ and mod.state == 'uninstallable': self.write(cursor, user, module_id, { 'state': 'uninstalled'}, context=context) - if vercmp(terp.get('version', ''), + if vercmp(tryton.get('version', ''), mod.latest_version or '0') > 0: self.write(cursor, user, module_id, { - 'latest_version': terp.get('version'), + 'latest_version': tryton.get('version'), 'url': '', }, context=context) res[0] += 1 self.write(cursor, user, module_id, { - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', ''), - 'website': terp.get('website', ''), - 'license': terp.get('license', 'GPL-2'), + 'description': tryton.get('description', ''), + 'shortdesc': tryton.get('name', ''), + 'author': tryton.get('author', ''), + 'website': tryton.get('website', ''), + 'license': tryton.get('license', 'GPL-2'), }) self._update_dependencies(cursor, user, module_id, - terp.get('depends', [])) + tryton.get('depends', [])) self._update_category(cursor, user, module_id, - terp.get('category', 'None')) + tryton.get('category', 'None')) continue mod_path = os.path.join(ADDONS_PATH, name) if os.path.isdir(mod_path) \ or os.path.islink(mod_path) \ or zipfile.is_zipfile(mod_path): - terp = Module.get_module_info(mod_name) - if not terp or not terp.get('installable', True): + tryton = Module.get_module_info(mod_name) + if not tryton or not tryton.get('installable', True): continue if not os.path.isfile( os.path.join(ADDONS_PATH, mod_name+'.zip')): @@ -364,18 +364,18 @@ class Module(OSV): new_id = self.create(cursor, user, { 'name': mod_name, 'state': 'uninstalled', - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown'), - 'website': terp.get('website', ''), - 'latest_version': terp.get('version', ''), - 'license': terp.get('license', 'GPL-2'), + 'description': tryton.get('description', ''), + 'shortdesc': tryton.get('name', ''), + 'author': tryton.get('author', 'Unknown'), + 'website': tryton.get('website', ''), + 'latest_version': tryton.get('version', ''), + 'license': tryton.get('license', 'GPL-2'), }) res[1] += 1 self._update_dependencies(cursor, user, new_id, - terp.get('depends', [])) + tryton.get('depends', [])) self._update_category(cursor, user, new_id, - terp.get('category', 'None')) + tryton.get('category', 'None')) import socket socket.setdefaulttimeout(10) @@ -448,17 +448,17 @@ class Module(OSV): except IOError: raise ExceptORM('Error', 'Can not create the module file: %s' % (fname,)) - terp = Module.get_module_info(mod.name) + tryton = Module.get_module_info(mod.name) self.write(cursor, user, mod.id, { - 'description': terp.get('description', ''), - 'shortdesc': terp.get('name', ''), - 'author': terp.get('author', 'Unknown'), - 'website': terp.get('website', ''), - 'license': terp.get('license', 'GPL-2'), + 'description': tryton.get('description', ''), + 'shortdesc': tryton.get('name', ''), + 'author': tryton.get('author', 'Unknown'), + 'website': tryton.get('website', ''), + 'license': tryton.get('license', 'GPL-2'), }) - self._update_dependencies(cursor, user, mod.id, terp.get('depends', + self._update_dependencies(cursor, user, mod.id, tryton.get('depends', [])) - self._update_category(cursor, user, mod.id, terp.get('category', + self._update_category(cursor, user, mod.id, tryton.get('category', 'Uncategorized')) return res diff --git a/trytond/ir/module/module.xml b/trytond/ir/module/module.xml index dd87930c05..74499be1d4 100644 --- a/trytond/ir/module/module.xml +++ b/trytond/ir/module/module.xml @@ -1,5 +1,5 @@ - + @@ -187,4 +187,4 @@ type="wizard" id="menu_module_install_upgrade"/> - + diff --git a/trytond/ir/module/repository.xml b/trytond/ir/module/repository.xml index 193a87ce73..72e9219218 100644 --- a/trytond/ir/module/repository.xml +++ b/trytond/ir/module/repository.xml @@ -1,5 +1,5 @@ - + ir.module.repository @@ -51,4 +51,4 @@ - + diff --git a/trytond/ir/property.xml b/trytond/ir/property.xml index 6909026848..ae4c0c7672 100644 --- a/trytond/ir/property.xml +++ b/trytond/ir/property.xml @@ -1,5 +1,5 @@ - + ir.property @@ -72,4 +72,4 @@ - + diff --git a/trytond/ir/rule.xml b/trytond/ir/rule.xml index 46ec065e93..1bd3153c71 100644 --- a/trytond/ir/rule.xml +++ b/trytond/ir/rule.xml @@ -1,5 +1,5 @@ - + ir.rule.group @@ -82,4 +82,4 @@ - + diff --git a/trytond/ir/sequence.xml b/trytond/ir/sequence.xml index 116a7e5e27..f8be96f28b 100644 --- a/trytond/ir/sequence.xml +++ b/trytond/ir/sequence.xml @@ -1,5 +1,5 @@ - + @@ -106,4 +106,4 @@ - + diff --git a/trytond/ir/translation.xml b/trytond/ir/translation.xml index ed26bbb89f..915fb7a047 100644 --- a/trytond/ir/translation.xml +++ b/trytond/ir/translation.xml @@ -1,5 +1,5 @@ - + ir.translation @@ -52,4 +52,4 @@ - + diff --git a/trytond/ir/ui/menu.xml b/trytond/ir/ui/menu.xml index 4b51c6d78e..58692cc19e 100644 --- a/trytond/ir/ui/menu.xml +++ b/trytond/ir/ui/menu.xml @@ -1,5 +1,5 @@ - + ir.ui.menu @@ -75,4 +75,4 @@ - + diff --git a/trytond/ir/ui/ui.xml b/trytond/ir/ui/ui.xml index 1e9bf9d053..18aae7c6cd 100644 --- a/trytond/ir/ui/ui.xml +++ b/trytond/ir/ui/ui.xml @@ -1,6 +1,6 @@ - + - + diff --git a/trytond/ir/ui/view.xml b/trytond/ir/ui/view.xml index b1e9f3a124..ea22bf5c7c 100644 --- a/trytond/ir/ui/view.xml +++ b/trytond/ir/ui/view.xml @@ -1,5 +1,5 @@ - + ir.ui.view @@ -95,4 +95,4 @@ - + diff --git a/trytond/ir/values.xml b/trytond/ir/values.xml index 9efc3ab89f..1c259be65e 100644 --- a/trytond/ir/values.xml +++ b/trytond/ir/values.xml @@ -1,5 +1,5 @@ - + ir.values @@ -56,4 +56,4 @@ - + diff --git a/trytond/module.py b/trytond/module.py index 95c2cc0624..edb1d542c7 100644 --- a/trytond/module.py +++ b/trytond/module.py @@ -106,18 +106,18 @@ def create_graph(module_list, force=None): for module in module_list: if module[-4:] == '.zip': module = module[:-4] - terp_file = OPJ(ADDONS_PATH, module, '__terp__.py') + tryton_file = OPJ(ADDONS_PATH, module, '__tryton__.py') mod_path = OPJ(ADDONS_PATH, module) if module in ('ir', 'workflow', 'res'): root_path = os.path.dirname(__file__) - terp_file = OPJ(root_path, module, '__terp__.py') + tryton_file = OPJ(root_path, module, '__tryton__.py') mod_path = OPJ(root_path, module) - if os.path.isfile(terp_file) or zipfile.is_zipfile(mod_path+'.zip'): + if os.path.isfile(tryton_file) or zipfile.is_zipfile(mod_path+'.zip'): try: - info = eval(tools.file_open(terp_file).read()) + info = eval(tools.file_open(tryton_file).read()) except: Logger().notify_channel('init', LOG_ERROR, - 'addon:%s:eval file %s' % (module, terp_file)) + 'addon:%s:eval file %s' % (module, tryton_file)) raise if info.get('installable', True): packages.append((module, info.get('depends', []), info)) diff --git a/trytond/res/__terp__.py b/trytond/res/__tryton__.py similarity index 100% rename from trytond/res/__terp__.py rename to trytond/res/__tryton__.py diff --git a/trytond/res/lang.xml b/trytond/res/lang.xml index d50454b4e9..04385ec260 100644 --- a/trytond/res/lang.xml +++ b/trytond/res/lang.xml @@ -1,5 +1,5 @@ - + en_US @@ -35,4 +35,4 @@ - + diff --git a/trytond/res/report/user.odt b/trytond/res/report/user.odt new file mode 100644 index 0000000000000000000000000000000000000000..7b1b0e744682ae7c5638b1851c4ca1f5d48b5860 GIT binary patch literal 7696 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 Xl7+ipegXh!_rGuV6*|gaFYEsRbmOdf literal 0 HcmV?d00001 diff --git a/trytond/res/request.xml b/trytond/res/request.xml index 20e439c31c..8da2872e9a 100644 --- a/trytond/res/request.xml +++ b/trytond/res/request.xml @@ -1,5 +1,5 @@ - + res.request @@ -136,4 +136,4 @@ - + diff --git a/trytond/res/res.xml b/trytond/res/res.xml index 34c4dfd13c..7600ca808d 100644 --- a/trytond/res/res.xml +++ b/trytond/res/res.xml @@ -1,6 +1,6 @@ - + - + diff --git a/trytond/res/users.xml b/trytond/res/users.xml index e5e0510c4a..c08abefd33 100644 --- a/trytond/res/users.xml +++ b/trytond/res/users.xml @@ -1,5 +1,5 @@ - + admin @@ -186,4 +186,4 @@ - + diff --git a/trytond/sql_db.py b/trytond/sql_db.py index e72e709d04..ecdc0641d6 100644 --- a/trytond/sql_db.py +++ b/trytond/sql_db.py @@ -116,20 +116,20 @@ def init_db(cursor): addons_path = os.path.join(os.path.dirname(__file__), 'addons') for i in (os.listdir(addons_path) + ['ir', 'workflow', 'res']): - terp_file = opj(addons_path, i, '__terp__.py') + tryton_file = opj(addons_path, i, '__tryton__.py') mod_path = opj(addons_path, i) if i in ('ir', 'workflow', 'res'): root_path = os.path.dirname(__file__) - terp_file = opj(root_path, i, '__terp__.py') + tryton_file = opj(root_path, i, '__tryton__.py') mod_path = opj(root_path, i) info = {} - if os.path.isfile(terp_file) \ + if os.path.isfile(tryton_file) \ and not os.path.isfile(opj(addons_path, i + '.zip')): - info = eval(file(terp_file).read()) + info = eval(file(tryton_file).read()) elif zipfile.is_zipfile(mod_path): zfile = zipfile.ZipFile(mod_path) i = os.path.splitext(i)[0] - info = eval(zfile.read(opj(i, '__terp__.py'))) + info = eval(zfile.read(opj(i, '__tryton__.py'))) if info: categs = info.get('category', 'Uncategorized').split('/') p_id = None diff --git a/trytond/tools/convert.py b/trytond/tools/convert.py index 34c3848021..c38a183334 100644 --- a/trytond/tools/convert.py +++ b/trytond/tools/convert.py @@ -274,7 +274,7 @@ class TrytondXmlHandler(sax.handler.ContentHandler): self.taghandler = None # Managed tags are handled by the current class - self.managedtags= ["data", "terp"] + self.managedtags= ["data", "tryton"] self.idlist = [] @@ -301,7 +301,7 @@ class TrytondXmlHandler(sax.handler.ContentHandler): elif name == "data": self.noupdate = attributes.get("noupdate", False) - elif name == "terp": + elif name == "tryton": pass else: diff --git a/trytond/workflow/__terp__.py b/trytond/workflow/__tryton__.py similarity index 100% rename from trytond/workflow/__terp__.py rename to trytond/workflow/__tryton__.py diff --git a/trytond/workflow/workflow.xml b/trytond/workflow/workflow.xml index 14d1d75e74..23e01e4d6e 100644 --- a/trytond/workflow/workflow.xml +++ b/trytond/workflow/workflow.xml @@ -1,5 +1,5 @@ - + @@ -271,4 +271,4 @@ - +