Skip to content

Trunk to master #46

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

Merged
merged 3 commits into from
Jun 9, 2017
Merged

Trunk to master #46

merged 3 commits into from
Jun 9, 2017

Conversation

KscSDK
Copy link
Collaborator

@KscSDK KscSDK commented Jun 9, 2017

修复 #39 导致 python 2.x 无法安装问题。

刘一辰 and others added 2 commits June 8, 2017 19:25
修复 #39 导致 python 2.x 无法安装问题。
原因:
  2.x版本open不支持encoding参数。
解决方法:
  替换原README.rst读取内容为默认字符串。
注:如有必要可做版本判断,2.x 使用 codecs.open或io.open 替代。
setup.py long_description update
@KscSDK
Copy link
Collaborator Author

KscSDK commented Jun 9, 2017

修复 #39 导致 python 2.x 无法安装问题。

@KscSDK
Copy link
Collaborator Author

KscSDK commented Jun 9, 2017

resolve conflict file

@KscSDK KscSDK merged commit 2de7a10 into master Jun 9, 2017
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.

1 participant