Merge branch 'trunk' into convert_to_BIG_SNAKE_CASE

Author: harsha509

MODULE.bazel

@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.15.1")
 bazel_dep(name = "rules_java", version = "7.6.3")
-bazel_dep(name = "rules_jvm_external", version = "6.1")
+bazel_dep(name = "rules_jvm_external", version = "6.3")
 bazel_dep(name = "rules_nodejs", version = "6.2.0")
 bazel_dep(name = "rules_oci", version = "1.7.6")
 bazel_dep(name = "rules_pkg", version = "0.10.1")

py/selenium/webdriver/firefox/firefox_profile.py

@@ -276,17 +276,11 @@ def parse_manifest_json(content):
 
         try:
             if zipfile.is_zipfile(addon_path):
-                # Bug 944361 - We cannot use 'with' together with zipFile because
-                # it will cause an exception thrown in Python 2.6.
-                # TODO: use with statement when Python 2.x is no longer supported
-                try:
-                    compressed_file = zipfile.ZipFile(addon_path, "r")
+                with zipfile.ZipFile(addon_path, "r") as compressed_file:
                     if "manifest.json" in compressed_file.namelist():
                         return parse_manifest_json(compressed_file.read("manifest.json"))
 
                     manifest = compressed_file.read("install.rdf")
-                finally:
-                    compressed_file.close()
             elif os.path.isdir(addon_path):
                 manifest_json_filename = os.path.join(addon_path, "manifest.json")
                 if os.path.exists(manifest_json_filename):