Revision: 147 Author: janne.t.harkonen Date: Fri Aug 24 04:20:13 2012 Log: own module for deprecated stuff http://code.google.com/p/robotframework-sshlibrary/source/detail?r=147
Added: /trunk/src/SSHLibrary/deprecated.py Modified: /trunk/src/SSHLibrary/__init__.py ======================================= --- /dev/null +++ /trunk/src/SSHLibrary/deprecated.py Fri Aug 24 04:20:13 2012 @@ -0,0 +1,43 @@ +# Copyright 2008-2010 Nokia Siemens Networks Oyj +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from robot import utils + + +class DeprecatedSSHLibraryKeywords(object): + """Mixin class containing deprecated keywords""" + + def set_timeout(self, timeout): + """*DEPRECATED* Use `Set Default Configuration` instead.""" + old = self._config.timeout + self._config.update(timeout=timeout) + return utils.secs_to_timestr(old) + + def set_newline(self, newline): + """*DEPRECATED* Use `Set Default Configuration` instead.""" + old = self._config.newline + self._config.update(newline=newline) + return old + + def set_prompt(self, prompt): + """*DEPRECATED* Use `Set Default Configuration` instead.""" + old = self._config.prompt or '' + self._config.update(prompt=prompt) + return old + + def set_default_log_level(self, level): + """*DEPRECATED* Use `Set Default Configuration` instead.""" + old = self._config.loglevel + self._config.update(loglevel=level) + return old ======================================= --- /trunk/src/SSHLibrary/__init__.py Wed Aug 22 21:55:51 2012 +++ /trunk/src/SSHLibrary/__init__.py Fri Aug 24 04:20:13 2012 @@ -20,15 +20,16 @@ from robot import utils -from connectioncache import ConnectionCache -from core import AuthenticationException from config import (Configuration, StringEntry, NewlineEntry, TimeEntry, IntegerEntry, LogLevelEntry) +from connectioncache import ConnectionCache +from core import AuthenticationException +from deprecated import DeprecatedSSHLibraryKeywords +from version import VERSION if utils.is_jython: from javaclient import JavaSSHClient as SSHClient else: from pythonclient import PythonSSHClient as SSHClient -from version import VERSION __version__ = VERSION @@ -59,35 +60,7 @@ height=IntegerEntry(height or 24)) -class DeprecatedKeywords(object): - """Mixin class containing deprecated keywords""" - - def set_timeout(self, timeout): - """*DEPRECATED* Use `Set Default Configuration` instead.""" - old = self._config.timeout - self._config.update(timeout=timeout) - return utils.secs_to_timestr(old) - - def set_newline(self, newline): - """*DEPRECATED* Use `Set Default Configuration` instead.""" - old = self._config.newline - self._config.update(newline=newline) - return old - - def set_prompt(self, prompt): - """*DEPRECATED* Use `Set Default Configuration` instead.""" - old = self._config.prompt or '' - self._config.update(prompt=prompt) - return old - - def set_default_log_level(self, level): - """*DEPRECATED* Use `Set Default Configuration` instead.""" - old = self._config.loglevel - self._config.update(loglevel=level) - return old - - -class SSHLibrary(DeprecatedKeywords): +class SSHLibrary(DeprecatedSSHLibraryKeywords): """SSH Library is a test library for Robot Framework that enables executing commands and transferring files over an SSH connection.
