Compute hostname only once

review597003
This commit is contained in:
Cédric Krier
2012-11-22 22:15:46 +01:00
parent 53b075e460
commit 032e62a8ae
+6 -6
View File
@@ -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):