134 fix psl args #135
Closed
134 fix psl args #135
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
Add code to set modified time to now for newly downloaded PSL file to avoid multiple downloads per day.
Update domain.py
…ive placeholder variables and if/else statements.
Matthew-Grayson
requested review from
dav3r,
felddy,
jasonodoom,
jsf9k and
mcdonnnj
as code owners
mcdonnnj
requested changes
May 24, 2023
Comment on lines
+71
to
+73
| # Write the arguments to a file for use by the trustymail library | ||
| with open('env.json', 'w') as env: | ||
| json.dump(args, env) |
There was a problem hiding this comment.
This is worse than a monkey patch and a complete non-starter to me as it breaks the API of this package.
There was a problem hiding this comment.
Noted; I'll make an adjustment.
There was a problem hiding this comment.
@mcdonnnj Thanks for the feedback. What are your thoughts on adding arguments (readonly, filename) to domain.get_psl and moving the call to get_psl to cli.py?
There was a problem hiding this comment.
I need to look at the least destructive way to fix this as I believe the monkey patch may only be an issue for the CLI. This package is used in other projects so I lean very conservatively against breaking changes that are not strictly necessary.
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
--psl-filename=FILENAMEand--psl-read-onlynow work as advertised.Remove monkey patches in domain.py. Remove PublicSuffixListFilename / PublicSuffixListReadOnly initialization in __main__.py; set default values in docopt usage pattern to compensate. Pass filename and readonly as a json file between cli.py and domain.py.
Additionally, removed several constants/variables from cli.py that are no longer needed after updating usage pattern. Trustymail now prints the docopt args dictionary. This is useful for confirming the default values are being used (feel free to remove this after testing).
💭 Motivation and context
This closes issue #134
🧪 Testing
pip install git+https://github.com/Matthew-Grayson/trustymail@134-fix-psl-argstrustymail cisa.govtrustymail --psl-filename=testfilename.dat cisa.govpython3 -c "from os import utime; os.utime('testfilename.dat', (1330712280, 1330712292))"trustymail --psl-filename=testfilename.dat --psl-read-only cisa.govtrustymail --psl-filename=testfilename.dat cisa.gov✅ Pre-approval checklist
in code comments.
to reflect the changes in this PR.
✅ Pre-merge checklist
✅ Post-merge checklist