[py]: use Zipfile in a context; remove duplicate imports, use compiled re pattern for searching

symonk · symonk · commit ed638af0c40b · 2022-09-04T18:25:03.000+01:00
diff --git a/py/selenium/webdriver/firefox/firefox_profile.py b/py/selenium/webdriver/firefox/firefox_profile.py
@@ -154,20 +154,19 @@ def assume_untrusted_cert_issuer(self, value) -> None:
         self.set_preference("webdriver_assume_untrusted_issuer", value)
 
     @property
-    def encoded(self):
+    def encoded(self) -> str:
         """
         A zipped, base64 encoded string of profile directory
         for use with remote WebDriver JSON wire protocol
         """
         self.update_preferences()
         fp = BytesIO()
-        zipped = zipfile.ZipFile(fp, 'w', zipfile.ZIP_DEFLATED)
-        path_root = len(self.path) + 1  # account for trailing slash
-        for base, dirs, files in os.walk(self.path):
-            for fyle in files:
-                filename = os.path.join(base, fyle)
-                zipped.write(filename, filename[path_root:])
-        zipped.close()
+        with zipfile.ZipFile(fp, 'w', zipfile.ZIP_DEFLATED) as zipped:
+            path_root = len(self.path) + 1  # account for trailing slash
+            for base, _, files in os.walk(self.path):
+                for fyle in files:
+                    filename = os.path.join(base, fyle)
+                    zipped.write(filename, filename[path_root:])
         return base64.b64encode(fp.getvalue()).decode('UTF-8')
 
     def _create_tempfolder(self):
@@ -185,13 +184,12 @@ def _write_user_prefs(self, user_prefs):
                 f.write(f'user_pref("{key}", {json.dumps(value)});\n')
 
     def _read_existing_userjs(self, userjs):
-        import warnings
 
-        PREF_RE = re.compile(r'user_pref\("(.*)",\s(.*)\)')
+        pref_pattern = re.compile(r'user_pref\("(.*)",\s(.*)\)')
         try:
             with open(userjs, encoding='utf-8') as f:
                 for usr in f:
-                    matches = re.search(PREF_RE, usr)
+                    matches = pref_pattern.search(usr)
                     try:
                         self.default_preferences[matches.group(1)] = json.loads(matches.group(2))
                     except Exception:
diff --git a/py/selenium/webdriver/remote/remote_connection.py b/py/selenium/webdriver/remote/remote_connection.py
@@ -127,7 +127,7 @@ def get_remote_connection_headers(cls, parsed_url, keep_alive=False):
     def _get_proxy_url(self):
         if self._url.startswith('https://'):
             return os.environ.get('https_proxy', os.environ.get('HTTPS_PROXY'))
-        elif self._url.startswith('http://'):
+        if self._url.startswith('http://'):
             return os.environ.get('http_proxy', os.environ.get('HTTP_PROXY'))
 
     def _identify_http_proxy_auth(self):
