Mange exception only and close_window() reversed

Keywords right after keyword 'Close Windwo' will fail due to
NoSuchWinowExecption:
1. keyword 'Select Window' with named argument
'name=xxx'/'title=xxx'/'url=xxx', fixed _select_matching() as it calls
get_current_window_handle()
2. keyword 'Get Window Ids/Names/Titles', will fail on
NoSuchWinowExecption, fixed _get_window_infos() as it calls
get_current_window_handle()

Also reversed close_window() (not switching to prevoius window)

Author: divfor

src/Selenium2Library/keywords/_browsermanagement.py

@@ -212,15 +212,8 @@ def switch_browser(self, index_or_alias):
     # Public, window management
 
     def close_window(self):
-        """Closes currently opened pop-up window and switch back to previous window.
-        It assumes the last opened window is in the last index of window list.
-        However, as opened windows are list-returned from tree-order in remote end,
-        please use 'Select Window' if automatic switching does not work as expected.
-        """
+        """Closes currently opened pop-up window."""
         self._current_browser().close()
-        handles = self._current_browser().get_window_handles()
-        if len(handles) >= 1:
-            self._current_browser().switch_to_window(handles[-1])
 
     def get_window_identifiers(self):
         """Returns and logs id attributes of all windows known to the browser."""

src/Selenium2Library/locators/windowmanager.py

@@ -85,19 +85,24 @@ def _parse_locator(self, locator):
 
     def _get_window_infos(self, browser):
         window_infos = []
-        starting_handle = browser.get_current_window_handle()
+        try:
+            starting_handle = browser.get_current_window_handle()
+        except NoSuchWindowException:
+            starting_handle = None
         try:
             for handle in browser.get_window_handles():
                 browser.switch_to_window(handle)
                 window_infos.append(browser.get_current_window_info())
         finally:
-            browser.switch_to_window(starting_handle)
+            if starting_handle:
+                browser.switch_to_window(starting_handle)
         return window_infos
 
     def _select_matching(self, browser, matcher, error):
         try:
             starting_handle = browser.get_current_window_handle()
-        except NoSuchWindowException: pass
+        except NoSuchWindowException:
+            starting_handle = None
         for handle in browser.get_window_handles():
             browser.switch_to_window(handle)
             if matcher(browser.get_current_window_info()):