Revision: 3638
Author: janne.t.harkonen
Date: Fri May 28 04:42:43 2010
Log: fixed usages if get_version
http://code.google.com/p/robotframework/source/detail?r=3638
Modified:
/trunk/src/robot/libraries/BuiltIn.py
/trunk/src/robot/libraries/Collections.py
/trunk/src/robot/libraries/Dialogs.py
/trunk/src/robot/libraries/OperatingSystem.py
/trunk/src/robot/libraries/Screenshot.py
/trunk/src/robot/libraries/String.py
/trunk/src/robot/libraries/Telnet.py
=======================================
--- /trunk/src/robot/libraries/BuiltIn.py Thu May 27 07:11:21 2010
+++ /trunk/src/robot/libraries/BuiltIn.py Fri May 28 04:42:43 2010
@@ -22,6 +22,7 @@
from robot.utils import asserts
from robot.variables import is_var, is_list_var
from robot.running import Keyword, NAMESPACES, RUN_KW_REGISTER
+from robot.version import get_version
if utils.is_jython:
from java.lang import String, Number, Long, Double
@@ -587,7 +588,7 @@
| Should Be Equal | ${message} | Hello Robot! |
If the given `text` contains only a single variable, its value is
- returned as-is and it can be any object. Otherwise this keyword
+ returned as-is and it can be any object. Otherwise this keyword
always returns a string.
"""
return self.get_variables().replace_scalar(text)
@@ -1410,11 +1411,11 @@
def set_test_message(self, message):
"""Sets message for for the current test.
-
- This is overridden by possible failure message, except when this
keyword
- is used in test case teardown. In test case teardown this overrides
+
+ This is overridden by possible failure message, except when this
keyword
+ is used in test case teardown. In test case teardown this overrides
messages even for failed tests.
-
+
This keyword can not be used in suite setup or suite teardown.
"""
test = NAMESPACES.current.test
@@ -1496,7 +1497,7 @@
"""
ROBOT_LIBRARY_SCOPE = 'GLOBAL'
- ROBOT_LIBRARY_VERSION = utils.get_version()
+ ROBOT_LIBRARY_VERSION = get_version()
def _matches(self, string, pattern):
# Must use this instead of fnmatch when string may contain
newlines.
=======================================
--- /trunk/src/robot/libraries/Collections.py Thu May 27 07:11:21 2010
+++ /trunk/src/robot/libraries/Collections.py Fri May 28 04:42:43 2010
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-
+from robot.version import get_version
from robot import utils
@@ -657,7 +657,7 @@
--------
"""
ROBOT_LIBRARY_SCOPE = 'GLOBAL'
- ROBOT_LIBRARY_VERSION = utils.get_version()
+ ROBOT_LIBRARY_VERSION = get_version()
def _verify_condition(condition, default_msg, given_msg,
include_default=False):
=======================================
--- /trunk/src/robot/libraries/Dialogs.py Tue Mar 23 04:15:41 2010
+++ /trunk/src/robot/libraries/Dialogs.py Fri May 28 04:42:43 2010
@@ -24,11 +24,11 @@
import sys
try:
- from robot import utils
+ from robot.version import get_version
except ImportError:
__version__ = 'unknown'
else:
- __version__ = utils.get_version()
+ __version__ = get_version()
DIALOG_TITLE = 'Robot Framework'
=======================================
--- /trunk/src/robot/libraries/OperatingSystem.py Wed May 26 06:32:12 2010
+++ /trunk/src/robot/libraries/OperatingSystem.py Fri May 28 04:42:43 2010
@@ -23,9 +23,10 @@
try:
from robot.errors import DataError
from robot.output import LOGGER
- from robot.utils import get_version, ConnectionCache, seq2str, \
- timestr_to_secs, secs_to_timestr, plural_or_not, get_time, \
- secs_to_timestamp, parse_time, unic, decode_output
+ from robot.version import get_version
+ from robot.utils import (ConnectionCache, seq2str, timestr_to_secs,
+ secs_to_timestr, plural_or_not, get_time,
+ secs_to_timestamp, parse_time, unic,
decode_output)
__version__ = get_version()
PROCESSES = ConnectionCache('No active processes')
=======================================
--- /trunk/src/robot/libraries/Screenshot.py Thu Apr 22 05:49:45 2010
+++ /trunk/src/robot/libraries/Screenshot.py Fri May 28 04:42:43 2010
@@ -21,6 +21,7 @@
from javax.imageio import ImageIO
from java.io import File
+from robot.version import get_version
from robot import utils
@@ -35,7 +36,7 @@
"""
ROBOT_LIBRARY_SCOPE = 'TEST SUITE'
- ROBOT_LIBRARY_VERSION = utils.get_version()
+ ROBOT_LIBRARY_VERSION = get_version()
def __init__(self, default_directory=None, log_file_directory=None):
"""Screenshot library can be imported with optional arguments.
=======================================
--- /trunk/src/robot/libraries/String.py Tue Mar 23 10:28:53 2010
+++ /trunk/src/robot/libraries/String.py Fri May 28 04:42:43 2010
@@ -18,7 +18,7 @@
from random import randint
from string import ascii_lowercase, ascii_uppercase, digits
-from robot import utils
+from robot.version import get_version
class String:
@@ -43,7 +43,7 @@
"""
ROBOT_LIBRARY_SCOPE = 'GLOBAL'
- ROBOT_LIBRARY_VERSION = utils.get_version()
+ ROBOT_LIBRARY_VERSION = get_version()
def get_line_count(self, string):
"""Returns and logs the number of lines in the given `string`."""
=======================================
--- /trunk/src/robot/libraries/Telnet.py Thu May 27 02:33:42 2010
+++ /trunk/src/robot/libraries/Telnet.py Fri May 28 04:42:43 2010
@@ -18,6 +18,7 @@
import re
import inspect
+from robot.version import get_version
from robot import utils
@@ -36,7 +37,7 @@
"""
ROBOT_LIBRARY_SCOPE = 'TEST_SUITE'
- ROBOT_LIBRARY_VERSION = utils.get_version()
+ ROBOT_LIBRARY_VERSION = get_version()
def __init__(self, timeout=3.0, newline='CRLF', prompt=None,
prompt_is_regexp=False):
"""Telnet library can be imported with optional arguments.
