Merge pull request #431 from zephraph/rf-2.9-hotfix

Hotfix for RF 2.9

Author: zephraph

CHANGES.rst

@@ -1,7 +1,11 @@
 Release Notes
 =============
 
-1.7 
+1.7.1 (hotfix)
+----------------
+- Remove references to GLOBAL_VARIABLES for RF 2.9 compatibility
+
+1.7
 ----------------
 - Added keyword 'List Windows' to return a list of all window handles.
   [divfor]

src/Selenium2Library/keywords/_logging.py

@@ -1,6 +1,6 @@
 import os
 import sys
-from robot.variables import GLOBAL_VARIABLES
+from robot.libraries.BuiltIn import BuiltIn
 from robot.api import logger
 from keywordgroup import KeywordGroup
 
@@ -12,10 +12,11 @@ def _debug(self, message):
         logger.debug(message)
 
     def _get_log_dir(self):
-        logfile = GLOBAL_VARIABLES['${LOG FILE}']
+        variables = BuiltIn().get_variables()
+        logfile = variables['${LOG FILE}']
         if logfile != 'NONE':
             return os.path.dirname(logfile)
-        return GLOBAL_VARIABLES['${OUTPUTDIR}']
+        return variables['${OUTPUTDIR}']
 
     def _html(self, message):
         logger.info(message, True, False)
@@ -38,4 +39,4 @@ def _log_list(self, items, what='item'):
         return items
 
     def _warn(self, message):
-        logger.warn(message)
+        logger.warn(message)

src/Selenium2Library/keywords/_tableelement.py

@@ -1,6 +1,5 @@
 import os
 import sys
-from robot.variables import GLOBAL_VARIABLES
 from robot.api import logger
 from Selenium2Library.locators import TableElementFinder
 from keywordgroup import KeywordGroup
@@ -17,10 +16,10 @@ def get_table_cell(self, table_locator, row, column, loglevel='INFO'):
 
         Row and column number start from 1. Header and footer rows are
         included in the count. A negative row or column number can be used
-        to get rows counting from the end (end: -1). Cell content from header 
-        or footer rows can be obtained with this keyword. To understand how 
+        to get rows counting from the end (end: -1). Cell content from header
+        or footer rows can be obtained with this keyword. To understand how
         tables are identified, please take a look at the `introduction`.
-        
+
         See `Page Should Contain` for explanation about `loglevel` argument.
         """
         row = int(row)
@@ -32,13 +31,13 @@ def get_table_cell(self, table_locator, row, column, loglevel='INFO'):
         table = self._table_element_finder.find(self._current_browser(), table_locator)
         if table is not None:
             rows = table.find_elements_by_xpath("./thead/tr")
-            if row_index >= len(rows) or row_index < 0: 
+            if row_index >= len(rows) or row_index < 0:
                 rows.extend(table.find_elements_by_xpath("./tbody/tr"))
-            if row_index >= len(rows) or row_index < 0: 
+            if row_index >= len(rows) or row_index < 0:
                 rows.extend(table.find_elements_by_xpath("./tfoot/tr"))
             if row_index < len(rows):
                 columns = rows[row_index].find_elements_by_tag_name('th')
-                if column_index >= len(columns) or column_index < 0: 
+                if column_index >= len(columns) or column_index < 0:
                     columns.extend(rows[row_index].find_elements_by_tag_name('td'))
                 if column_index < len(columns):
                     return columns[column_index].text
@@ -58,7 +57,7 @@ def table_cell_should_contain(self, table_locator, row, column, expected, loglev
 
         To understand how tables are identified, please take a look at
         the `introduction`.
-        
+
         See `Page Should Contain` for explanation about `loglevel` argument.
         """
         message = ("Cell in table '%s' in row #%s and column #%s "
@@ -78,7 +77,7 @@ def table_cell_should_contain(self, table_locator, row, column, expected, loglev
     def table_column_should_contain(self, table_locator, col, expected, loglevel='INFO'):
         """Verifies that a specific column contains `expected`.
 
-        The first leftmost column is column number 1. A negative column 
+        The first leftmost column is column number 1. A negative column
         number can be used to get column counting from the end of the row (end: -1).
         If the table contains cells that span multiple columns, those merged cells
         count as a single column. For example both tests below work,
@@ -136,10 +135,10 @@ def table_header_should_contain(self, table_locator, expected, loglevel='INFO'):
     def table_row_should_contain(self, table_locator, row, expected, loglevel='INFO'):
         """Verifies that a specific table row contains `expected`.
 
-        The uppermost row is row number 1. A negative column 
-        number can be used to get column counting from the end of the row 
-        (end: -1). For tables that are structured with thead, tbody and tfoot, 
-        only the tbody section is searched. Please use `Table Header Should Contain` 
+        The uppermost row is row number 1. A negative column
+        number can be used to get column counting from the end of the row
+        (end: -1). For tables that are structured with thead, tbody and tfoot,
+        only the tbody section is searched. Please use `Table Header Should Contain`
         or `Table Footer Should Contain` for tests against the header or
         footer content.
 
@@ -169,4 +168,4 @@ def table_should_contain(self, table_locator, expected, loglevel='INFO'):
         if element is None:
             self.log_source(loglevel)
             raise AssertionError("Table identified by '%s' should have contained text '%s'." \
-                % (table_locator, expected))
+                % (table_locator, expected))