Revision: 169
Author: janne.t.harkonen
Date: Wed Aug 29 04:20:40 2012
Log: Easier usage for SSHClient factory
http://code.google.com/p/robotframework-sshlibrary/source/detail?r=169
Modified:
/trunk/src/SSHLibrary/client.py
/trunk/src/SSHLibrary/library.py
=======================================
--- /trunk/src/SSHLibrary/client.py Mon Aug 27 05:07:10 2012
+++ /trunk/src/SSHLibrary/client.py Wed Aug 29 04:20:40 2012
@@ -22,11 +22,13 @@
from robot import utils
-from .core import SSHClientException, TimeEntry
+from .core import ClientConfig, SSHClientException, TimeEntry
-def SSHClient(config):
- return _SSHClientClass()(config)
+def SSHClient(host, alias=None, port=22, timeout=3, newline='LF',
prompt=None,
+ term_type='vt100', width=80, height=24):
+ return _SSHClientClass()(ClientConfig(host, alias, port, timeout,
newline,
+ prompt, term_type, width,
height))
def _SSHClientClass():
=======================================
--- /trunk/src/SSHLibrary/library.py Mon Aug 27 05:07:10 2012
+++ /trunk/src/SSHLibrary/library.py Wed Aug 29 04:20:40 2012
@@ -1,6 +1,6 @@
from .client import SSHClient, AbstractSSHClient
from .connectioncache import ConnectionCache
-from .core import DefaultConfig, ClientConfig, SSHClientException
+from .core import DefaultConfig, SSHClientException
from .deprecated import DeprecatedSSHLibraryKeywords
from .version import VERSION
@@ -126,9 +126,9 @@
timeout = timeout or self._config.timeout
newline = newline or self._config.newline
prompt = prompt or self._config.prompt
- config = ClientConfig(host, alias, port, timeout, newline, prompt,
- term_type, width, height)
- return self._cache.register(SSHClient(config), config.alias)
+ client = SSHClient(host, alias, port, timeout, newline, prompt,
+ term_type, width, height)
+ return self._cache.register(client, alias)
def switch_connection(self, index_or_alias):
"""Switches between active connections using index or alias.
