Removed deprecated window selectors (#1200)

Fixes 1187

Author: aaltat

src/SeleniumLibrary/keywords/window.py

@@ -94,12 +94,12 @@ def select_window(self, locator='MAIN', timeout=None):
 
         - The ``strategy:value`` syntax is only supported by SeleniumLibrary
           3.0 and newer.
-        - Earlier versions supported aliases ``None``, ``null`` and the
-          empty string for selecting the main window, and alias ``self``
-          for selecting the current window. These aliases were deprecated
-          in SeleniumLibrary 3.0.
         - Prior to SeleniumLibrary 3.0 matching windows by name, title
           and URL was case-insensitive.
+        - Earlier versions supported aliases ``None``, ``null`` and the
+          empty string for selecting the main window, and alias ``self``
+          for selecting the current window. Support for these aliases were
+          removed in SeleniumLibrary 3.2.
         """
         epoch = time.time()
         timeout = epoch if is_falsy(timeout) else timestr_to_secs(timeout) + epoch

src/SeleniumLibrary/locators/windowmanager.py

@@ -30,13 +30,6 @@
 
 
 class WindowManager(ContextAware):
-    _deprecated_locators = {
-        None: 'main',
-        'null': 'main',
-        '': 'main',
-        'popup': 'new',
-        'self': 'current'
-    }
 
     def __init__(self, ctx):
         ContextAware.__init__(self, ctx)
@@ -63,7 +56,6 @@ def get_window_infos(self):
         return infos
 
     def select(self, locator, timeout=0):
-        locator = self._handle_deprecated_locators(locator)
         while True:
             try:
                 return self._select(locator)
@@ -85,17 +77,6 @@ def _select(self, locator):
             strategy, locator = self._parse_locator(locator)
             self._strategies[strategy](locator)
 
-    def _handle_deprecated_locators(self, locator):
-        if not (is_string(locator) or locator is None):
-            return locator
-        normalized = locator.lower() if is_string(locator) else locator
-        if normalized in self._deprecated_locators:
-            new = self._deprecated_locators[normalized]
-            logger.warn("Using '%s' as window locator is deprecated. "
-                        "Use '%s' instead." % (locator, new))
-            return new
-        return locator
-
     def _parse_locator(self, locator):
         index = self._get_locator_separator_index(locator)
         if index != -1:

utest/test/locators/test_windowmanager.py

@@ -99,19 +99,6 @@ def test_select_by_url_no_match(self):
             "Unable to locate window with URL 'http://localhost/page-1.html'."
         )
 
-    def test_select_with_deprecated_locators_to_select_main_window(self):
-        manager = WindowManagerWithMockBrowser(
-            {'name': 'win1', 'title': "Title 1", 'url': 'http://localhost/page1.html'},
-            {'name': 'win2', 'title': "Title 2", 'url': 'http://localhost/page2.html'},
-            {'name': 'win3', 'title': "Title 3", 'url': 'http://localhost/page3.html'}
-        )
-        for deprecated in [None, 'null', 'NULL', '']:
-            manager.select("name=win2")
-            msg = "Using '%s' as window locator is deprecated. Use 'main' instead." % deprecated
-            with when(logger).warn(msg).thenReturn(None):
-                manager.select(deprecated)
-            self.assertEqual(manager.driver.current_window.name, 'win1')
-
     def test_select_main_window(self):
         manager = WindowManagerWithMockBrowser(
             {'name': 'win1', 'title': "Title 1", 'url': 'http://localhost/page1.html'},