Brotli: Don't accept brotli if library can't be loaded. #444
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
and also remove 'br' from any Accept-Encoding to avoid recording with brotli, addresses #434
N0taN3rd
reviewed
Feb 20, 2019
pywb/rewrite/rewriteinputreq.py
Outdated
| try: # pragma: no cover | ||
| import brotli | ||
| has_brotli = True | ||
| except: # pragma: no cover |
There was a problem hiding this comment.
I think it would be good practice to start using named exceptions when possible.
Here it would be except ImportError in order to be clearer about why we expect an exception and to be pythonic :)
There was a problem hiding this comment.
In general, yes, but here want to catch any Exception as that means brotli is not properly installed. Added Exception
Codecov Report
@@ Coverage Diff @@
## develop #444 +/- ##
===========================================
+ Coverage 87.83% 87.84% +<.01%
===========================================
Files 59 59
Lines 7236 7239 +3
Branches 1288 1290 +2
===========================================
+ Hits 6356 6359 +3
Misses 585 585
Partials 295 295
Continue to review full report at Codecov.
|
N0taN3rd
added a commit
to N0taN3rd/warcio
that referenced
this pull request
Feb 20, 2019
…be gain performance increases (https://docs.python.org/3/faq/programming.html#id37) Changed the caught exception in try_brotli_init from ImportError to Exception due to finding causing pywb PR #444 (webrecorder/pywb#444)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
If
import brotlifails, print warning and removebrfromAccept-EncodingOtherwise, can fail silently when trying to record/replay brotli content.
Motivation and Context
See #434
Screenshots (if appropriate):
Types of changes
Checklist: