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

Master #128

Merged
merged 3 commits into from
Sep 26, 2015
Merged

Master #128

merged 3 commits into from
Sep 26, 2015

Conversation

sbonnick
Copy link
Contributor

made changes as discussed in previous pull request: #127

Added back inheritance of object as it is required for python2 support.
rtype is added back to reduce risk of overall impact of change.
@philiptzou
Copy link
Collaborator

Does that work in your PyCharm?

@sbonnick
Copy link
Contributor Author

yep. I can confirm this fixes the issue.

@@ -271,6 +271,8 @@ def __init__(self, constants=None, version=VERSION_FLAG_STYLE):
@param version: Default style version of current Calendar instance.
Valid value can be 1 (L{VERSION_FLAG_STYLE}) or
2 (L{VERSION_CONTEXT_STYLE}). See L{parse()}.

@rtype: Calendar
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there are 2 tabs but not 8 spaces. Please fix it. And please remove the extra spaces/tabs of line 274.

converted tabs to spaces and added .editorconfig file to prevent this
from happening in the future. .editorconfig file are supported by many
IDEs including notepad++, Idea, etc...
@bear
Copy link
Owner

bear commented Sep 26, 2015

for the record... anyone is allowed to tell me nicely "hey, umm, bear... that's a silly change ;)"

thanks for the issue @sbonnick and for the curation @philiptzou

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.

3 participants