[py]: use cls for class methods; be explicit with open(..., encoding=...)

symonk · symonk · commit 6b4b9f867846 · 2022-09-02T20:45:45.000+01:00
diff --git a/py/selenium/webdriver/firefox/extension_connection.py b/py/selenium/webdriver/firefox/extension_connection.py
@@ -65,14 +65,14 @@ def connect(self):
                             {'desiredCapabilities': DesiredCapabilities.FIREFOX})
 
     @classmethod
-    def connect_and_quit(self):
+    def connect_and_quit(cls):
         """Connects to an running browser and quit immediately."""
-        self._request('%s/extensions/firefox/quit' % _URL)
+        cls._request('%s/extensions/firefox/quit' % _URL)
 
     @classmethod
-    def is_connectable(self):
+    def is_connectable(cls):
         """Tries to connect to the extension but do not retrieve context."""
-        utils.is_connectable(self.profile.port)
+        utils.is_connectable(cls.profile.port)
 
 
 class ExtensionConnectionError(Exception):
diff --git a/py/selenium/webdriver/firefox/firefox_profile.py b/py/selenium/webdriver/firefox/firefox_profile.py
@@ -59,7 +59,7 @@ def __init__(self, profile_directory=None):
                       DeprecationWarning, stacklevel=2)
         if not FirefoxProfile.DEFAULT_PREFERENCES:
             with open(os.path.join(os.path.dirname(__file__),
-                                   WEBDRIVER_PREFERENCES)) as default_prefs:
+                                   WEBDRIVER_PREFERENCES), encoding='utf-8') as default_prefs:
                 FirefoxProfile.DEFAULT_PREFERENCES = json.load(default_prefs)
 
         self.default_preferences = copy.deepcopy(
@@ -180,7 +180,7 @@ def _write_user_prefs(self, user_prefs):
         """
         writes the current user prefs dictionary to disk
         """
-        with open(self.userPrefs, "w") as f:
+        with open(self.userPrefs, "w", encoding='utf-8') as f:
             for key, value in user_prefs.items():
                 f.write(f'user_pref("{key}", {json.dumps(value)});\n')
 
@@ -189,7 +189,7 @@ def _read_existing_userjs(self, userjs):
 
         PREF_RE = re.compile(r'user_pref\("(.*)",\s(.*)\)')
         try:
-            with open(userjs) as f:
+            with open(userjs, encoding='utf-8') as f:
                 for usr in f:
                     matches = re.search(PREF_RE, usr)
                     try:
@@ -322,10 +322,10 @@ def parse_manifest_json(content):
             elif os.path.isdir(addon_path):
                 manifest_json_filename = os.path.join(addon_path, 'manifest.json')
                 if os.path.exists(manifest_json_filename):
-                    with open(manifest_json_filename) as f:
+                    with open(manifest_json_filename, encoding='utf-8') as f:
                         return parse_manifest_json(f.read())
 
-                with open(os.path.join(addon_path, 'install.rdf')) as f:
+                with open(os.path.join(addon_path, 'install.rdf'), encoding='utf-8') as f:
                     manifest = f.read()
             else:
                 raise OSError('Add-on path is neither an XPI nor a directory: %s' % addon_path)
diff --git a/py/selenium/webdriver/firefox/service.py b/py/selenium/webdriver/firefox/service.py
@@ -46,7 +46,7 @@ def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
             in the services' environment.
 
         """
-        log_file = open(log_path, "a+") if log_path else None
+        log_file = open(log_path, "a+", encoding='utf-8') if log_path else None
 
         super().__init__(executable_path, port=port, log_file=log_file, env=env)
         self.service_args = service_args or []
diff --git a/py/selenium/webdriver/firefox/webdriver.py b/py/selenium/webdriver/firefox/webdriver.py
@@ -245,7 +245,7 @@ def install_addon(self, path, temporary=False) -> str:
                 driver.install_addon('/path/to/firebug.xpi')
         """
 
-        if (os.path.isdir(path)):
+        if os.path.isdir(path):
             fp = BytesIO()
             path_root = len(path) + 1  # account for trailing slash
             with zipfile.ZipFile(fp, 'w', zipfile.ZIP_DEFLATED) as zipped:
diff --git a/py/selenium/webdriver/safari/service.py b/py/selenium/webdriver/safari/service.py
@@ -54,7 +54,7 @@ def __init__(self, executable_path: str = DEFAULT_EXECUTABLE_PATH,
         self.quiet = quiet
         log = PIPE
         if quiet:
-            log = open(os.devnull, 'w')
+            log = open(os.devnull, 'w', encoding='utf-8')
         super().__init__(executable_path, port, log)
 
     def command_line_args(self):
