Author: tmckay Date: 2012-10-19 19:08:28 +0000 (Fri, 19 Oct 2012) New Revision: 5516
Modified: trunk/sage/python/sage/aviary/aviaryoperations.py trunk/sage/python/sage/util.py Log: Use socket.fqdn for building server lists and looking up hosts in FixedServerList
Modified: trunk/sage/python/sage/aviary/aviaryoperations.py =================================================================== --- trunk/sage/python/sage/aviary/aviaryoperations.py 2012-10-19 16:40:42 UTC (rev 5515) +++ trunk/sage/python/sage/aviary/aviaryoperations.py 2012-10-19 19:08:28 UTC (rev 5516) @@ -68,6 +68,7 @@ ''' scheme = "" host = "" + name = socket.getfqdn(name) if name in servers: urls = servers[name] if len(urls) > 0:
Modified: trunk/sage/python/sage/util.py =================================================================== --- trunk/sage/python/sage/util.py 2012-10-19 16:40:42 UTC (rev 5515) +++ trunk/sage/python/sage/util.py 2012-10-19 19:08:28 UTC (rev 5516) @@ -4,6 +4,7 @@ import copy import string import os +import socket
class MethodResult(object): ''' @@ -268,6 +269,8 @@ url.port = loc else: url = parse_URL(loc) + if url.host is not None: + url.host = socket.getfqdn(url.host) if url.scheme is None: url.scheme = default_scheme if url.path is None:
cumin-developers@lists.fedorahosted.org