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

Removed six package and other older py cleanup values #222

Merged
merged 1 commit into from
Jul 15, 2020

Conversation

jborean93
Copy link
Contributor

Six was only required when the code was trying to be py2 compatible. That's no longer the case so we can remove that requirement.

Fixes #221

Copy link
Member

@frozencemetery frozencemetery left a comment

Choose a reason for hiding this comment

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

Two nits inline. I'll take care of them and merge.

README.txt Outdated
@@ -38,7 +38,7 @@ Basic

* Python 3.6+ (older releases support older versions, but are unsupported)

* the `six` and `decorator` python packages
* the `decorator` python packages
Copy link
Member

Choose a reason for hiding this comment

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

Package, singular.

@@ -4,7 +4,7 @@
# and then run "tox" from this directory.

[tox]
envlist = py27,py33,py34,py35,py36,py37
envlist = py36,py37,py38
Copy link
Member

Choose a reason for hiding this comment

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

python-3.8 won't work yet; we need to figure out and merge #219 for that. This PR will cause a merge conflict with that one, but it should be easily sorted once this merges. Since we don't use tox ourselves, this is probably fine.

gssapi/_utils.py Outdated
return x.encode(_ENCODING)
else:
return x

return dict((enc(k), enc(v)) for k, v in six.iteritems(d))
return dict((enc(k), enc(v)) for k, v in iter(d.items()))
Copy link
Member

Choose a reason for hiding this comment

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

This can be more clear with a dict comprehension.

Resolves: pythongssapi#221
[rharwood@redhat.com: cleaned up a couple idioms]
@frozencemetery frozencemetery merged commit dac08a8 into pythongssapi:master Jul 15, 2020
@jborean93 jborean93 deleted the remove-six branch July 15, 2020 18:34
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.

six shouldn't be required anymore
2 participants