From 032e62a8ae8a67778051cd2ec80f36de65f963fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Thu, 22 Nov 2012 22:15:46 +0100 Subject: [PATCH] Compute hostname only once review597003 --- trytond/url.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/trytond/url.py b/trytond/url.py index e25fa8f814..354f94c04b 100644 --- a/trytond/url.py +++ b/trytond/url.py @@ -10,6 +10,11 @@ from trytond.transaction import Transaction __all__ = ['URLMixin'] +HOSTNAME = (CONFIG['hostname_jsonrpc'] + or unicode(socket.getfqdn(), 'utf8')) +HOSTNAME = '.'.join(encodings.idna.ToASCII(part) for part in + HOSTNAME.split('.')) + class URLAccessor(object): @@ -18,11 +23,6 @@ class URLAccessor(object): from trytond.wizard import Wizard from trytond.report import Report - hostname = (CONFIG['hostname_jsonrpc'] - or unicode(socket.getfqdn(), 'utf8')) - hostname = '.'.join(encodings.idna.ToASCII(part) for part in - hostname.split('.')) - url_part = {} if issubclass(cls, Model): url_part['type'] = 'model' @@ -39,7 +39,7 @@ class URLAccessor(object): local_part = urllib.quote('%(database)s/%(type)s/%(name)s' % url_part) if isinstance(inst, Model) and inst.id: local_part += '/%d' % inst.id - return 'tryton://%s/%s' % (hostname, local_part) + return 'tryton://%s/%s' % (HOSTNAME, local_part) class URLMixin(object):