From 2ce95e0eff284afcecc86359b2d585b657c26d5a Mon Sep 17 00:00:00 2001 From: Fredrik Tolf Date: Fri, 16 Nov 2007 03:08:14 +0100 Subject: [PATCH] Updated mustconnect and cnl to the new dc_connect API. --- lib/python/dolcon/__init__.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/python/dolcon/__init__.py b/lib/python/dolcon/__init__.py index 5ee9e40..c007e01 100644 --- a/lib/python/dolcon/__init__.py +++ b/lib/python/dolcon/__init__.py @@ -50,7 +50,10 @@ def mustconnect(host, revision = latest): any of these steps fail, an exception is raised. If successful, the file descriptor for the server connection is returned. """ - fd = connect(host) + if host is None: + fd = connect() + else: + fd = connect(host) while True: resp = getresp() if resp is not None and resp.getcmd() == u".connect": @@ -65,15 +68,10 @@ def mustconnect(host, revision = latest): def cnl(host = None, useauthless = True, revision = latest, **kw): """A convenience function for connect and loginasync. - This function will connect to the given server, or the server in - the environment variable $DCSERVER if none is given, or, if that - fails, localhost, and authenticate to the server. If any of the - steps fail, an exception is raised. + This function will connect to the given server, or try the default + servers if none given, and authenticate to the server. If any of + the steps fail, an exception is raised. """ - if host is None: - host = os.getenv("DCSERVER") - if host is None: - host = "localhost" fd = mustconnect(host, revision) err, reason = login(useauthless, **kw) if err != "success": -- 2.11.0