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.

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

Support for encodings #390

Merged
merged 11 commits into from
Mar 17, 2018
Merged

Support for encodings #390

merged 11 commits into from
Mar 17, 2018

Conversation

tjguk
Copy link
Collaborator

@tjguk tjguk commented Mar 16, 2018

This support adds testing & functional support for reading & writing Mu files with encodings and line-endings. But it does not actually integrate that functionality in the current Mu codebase. With the pace of change in the codebase at the moment I found myself mired in push races and merge conflicts. So this does the minimum possible to get the support in now, ready for the more intrusive changes afterwards.

This will supersede #370

@tjguk tjguk mentioned this pull request Mar 16, 2018
@tjguk
Copy link
Collaborator Author

tjguk commented Mar 16, 2018

Hold until I run and sort out make check

@ntoll
Copy link
Member

ntoll commented Mar 17, 2018

@tjguk this is great..! Please do let me know when I can check/merge.

You mention more intrusive upcoming changes. What might they be?

@ntoll
Copy link
Member

ntoll commented Mar 17, 2018

Hi @tjguk, could the tests in test_logic_read_write move to test_logic..? The convention used so far is to put tests pertaining to a certain file foo.py into test_foo.py. I realise this means test_foo.py may become large, but at least I know where to look for tests since there's a convention that's always followed (and I can use my editor's find functionality). Sorry about that... I should have made that clear. Once fixed I'm happy to merge this.

@tjguk
Copy link
Collaborator Author

tjguk commented Mar 17, 2018

Certainly. The reasons for the move were twofold: one was, as you suggest, to prevent test_logic from becoming even bigger. But the principal one was because of the conflicts I'd experienced the previous time round. I'll bring them back in now.

Meanwhile: can you see what Appveyor is complaining about? I can't.

… requests.

(They were previously held separately partly to keep the size of test_logic.py down but principally to avoid messy merge conflicts at a time when the pace of change to logic.py was greater)
@ntoll ntoll merged commit 6121350 into mu-editor:master Mar 17, 2018
@ntoll
Copy link
Member

ntoll commented Mar 17, 2018

Thank you! :-)

Appveyor shouldn't complain now... I fixed the problem in master.

@tjguk tjguk mentioned this pull request Mar 18, 2018
@tjguk tjguk deleted the support-for-encodings branch December 11, 2020 08:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants