Fix the indentation, trailing whitespace and a few other extras #9
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.
I've replaced all the 3 space indentation with 4 spaces, this is usually the standard for Python (see PEP8). It will also help avoid merge conflicts with the various forks of this project that are starting to get both mixed in.
Trailing whitespace can also cause merge conflict headaches, as some editors show it, some don't, etc and not all diff setups will show the cause of a diff made by them.
EndOfFile blank lines are much the same thing. Many editors treat the last line in a file differently and put different meta characters there so it's usually easier to keep them blank to avoid unwanted diffs.
Only the
phenny
module needs to actually be executable (or have a hashbang) as all the other modules are imported.The listed conflicts are because I pulled this in from the Incuna fork where I'd already done some development and will carry on with the rest of my changes. I've done this to try to make such a potentially hazardous commit easier to merge into your version.
Commit Message
opening them from within python.
Conflicts: