Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firefox_profile.py: use with statement in zipfile as Python 2.x support is dropped #14489

Merged
merged 5 commits into from
Sep 12, 2024
Merged

firefox_profile.py: use with statement in zipfile as Python 2.x support is dropped #14489

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a125e1
java/cookie: escape cookie values when required
Delta456 Sep 11, 2024
f45a4b6
add xss escaping
Delta456 Sep 11, 2024
860a790
firefox_profile.py: use `with` statement in zipfile as Python 2.x sup…
Delta456 Sep 12, 2024
be94161
remove java changes
Delta456 Sep 12, 2024
d6a9236
Merge branch 'trunk' into py_with
harsha509 Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions py/selenium/webdriver/firefox/firefox_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Loading