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

Fix the indentation, trailing whitespace and a few other extras #9

Closed
wants to merge 1 commit into from

Conversation

ghickman
Copy link

@ghickman ghickman commented Aug 3, 2011

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

  • Get rid of the terrible 3 space indents
  • Remove trailing whitespace
  • Add trailing lines to the EOF
  • Set permissions to 644, no need to have execute the permission
  • Remove the hash bangs from all files. They're not needed when we're
    opening them from within python.

Conflicts:

__init__.py
bot.py
icao.py
irc.py
modules/dict.py
modules/friday.py
modules/googlunch.py
modules/imdb.py
modules/wikipedia.py
modules/wiktionary.py
phenny
tools.py
web.py

- Get rid of the terrible 3 space indents
- Remove trailing whitespace
- Add trailing lines to the EOF
- Set permissions to 644, no need to have execute the permission
- Remove the hash bangs from all files. They're not needed when we're
  opening them from within python.

Conflicts:

	__init__.py
	bot.py
	icao.py
	irc.py
	modules/dict.py
	modules/friday.py
	modules/googlunch.py
	modules/imdb.py
	modules/wikipedia.py
	modules/wiktionary.py
	phenny
	tools.py
	web.py
@sbp
Copy link
Owner

sbp commented Aug 3, 2011

Thanks for your work on phenny. I appreciate it when people contribute major patches. I'm going to decline this pull request, however, because I think that people should stick to local conventions when programming. That and I'd end up swearing too much at my editor when I muscle memory the 3 spaces. Thanks again for your submission.

@sbp sbp closed this Aug 3, 2011
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.

None yet

2 participants