onbehalf of Dominik Ruf

firefox may be installed without admininstrator privileges and therefore there may be no HKEY_LOCAL_MACHINE entry Fixes Issue SeleniumHQ#7784
Sundrique · Sep 8, 2014 · 15f21d7 · 15f21d7
1 parent e41d76b
commit 15f21d7
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/py/selenium/webdriver/firefox/firefox_binary.py b/py/selenium/webdriver/firefox/firefox_binary.py
@@ -112,9 +112,9 @@ def _wait_until_connectable(self):
 
     def _find_exe_in_registry(self):
         try:
-            from _winreg import OpenKey, QueryValue, HKEY_LOCAL_MACHINE
+            from _winreg import OpenKey, QueryValue, HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER
         except ImportError:
-            from winreg import OpenKey, QueryValue, HKEY_LOCAL_MACHINE
+            from winreg import OpenKey, QueryValue, HKEY_LOCAL_MACHINE, HKEY_CURRENT_USER
         import shlex
         keys = (
            r"SOFTWARE\Classes\FirefoxHTML\shell\open\command",
@@ -127,7 +127,12 @@ def _find_exe_in_registry(self):
                 command = QueryValue(key, "")
                 break
             except OSError:
-                pass
+                try:
+                    key = OpenKey(HKEY_CURRENT_USER, path)
+                    command = QueryValue(key, "")
+                    break
+                except OSError:
+                    pass
         else:
             return ""