Drop Python 2 support, add mocks in tests #705
Merged
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
The file=sys.stderr was part of the format(), so an error got printed to stdout
Use builtins.open() instead
7 tasks
pspeter
force-pushed
the
cleanup-py2-leftovers
branch
2 times, most recently
from
c098619 to
7d9795a
Compare
wren
reviewed
Nov 12, 2019
| @@ -13,11 +13,11 @@ Feature: Upgrading Journals from 1.x.x to 2.x.x | |||
|
|
|||
| Scenario: Upgrading a journal encrypted with jrnl 1.x | |||
| Given we use the config "encrypted_old.json" | |||
| When we run "jrnl -n 1" and enter | |||
wren
reviewed
Nov 12, 2019
| @@ -118,7 +115,7 @@ def _parse(self, journal_txt): | |||
| # Initialise our current entry | |||
| entries = [] | |||
|
|
|||
| date_blob_re = re.compile("(?:^|\n)\[([^\\]]+)\] ") | |||
| date_blob_re = re.compile("(?:^|\n)\\[([^\\]]+)\\] ") | |||
There was a problem hiding this comment.
(optional nitpick): use raw string here for regex to avoid double-escaping
wren
reviewed
Nov 12, 2019
| pass | ||
|
|
||
| log.debug('Using journal "%s"', journal_name) | ||
| mode_compose, mode_export, mode_import = guess_mode(args, config) | ||
|
|
||
There was a problem hiding this comment.
also, this is optional and a nitpick
wren
reviewed
Nov 12, 2019
| @@ -18,7 +17,8 @@ class YAMLExporter(TextExporter): | |||
| def export_entry(cls, entry, to_multifile=True): | |||
| """Returns a markdown representation of a single entry, with YAML front matter.""" | |||
| if to_multifile is False: | |||
| print("{}ERROR{}: YAML export must be to individual files. Please specify a directory to export to.".format("\033[31m", "\033[0m", file=sys.stderr)) | |||
| print("{}ERROR{}: YAML export must be to individual files. " | |||
There was a problem hiding this comment.
(optional) missed ERROR_COLOR, etc here
wren
reviewed
Nov 12, 2019
| config_file = f.read() | ||
| if not config_file.strip().startswith("{"): | ||
| return | ||
|
|
||
| config = util.load_config(config_path) | ||
|
|
||
| util.prompt("""Welcome to jrnl {}. | ||
| print("""Welcome to jrnl {}. |
There was a problem hiding this comment.
This is no longer going to stderr.
|
Glad to help! But I could've fixed the nitpicks before merging (and squash the fixup commits) if you waited a little bit ;). |
wren
changed the title
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR should completely remove all the Python 2 compatibility features and other leftovers.
Closes #701, closes #615, fixes #700, might fix #667.
I also removed the wonky testing utilities in jrnl.utils and instead used unittest.mock.patch to simulate user inputs in the tests. It's a bit unusual as well this way, but at least we don't have to mess with replacing std.stdin and sys.stderr and what not. If somebody knows a simpler way to simulate user input that works with builtins.input, getpass.getpass as well as sys.stdin.read, let me know.
This is a bit of a bigger PR, but the tests all pass.
Todo
Checklist