python-driver
python-driver copied to clipboard
scylladb
Remove some remnants of Python2
We recently dropped support for Python < 3.6, but there were still a lot of places in the codebase with workarounds required for those versions - most notably usage of six package.
This PR removes all usages of six, removes six from dependencies, removes all workarounds for older versions that I found and fixes comments / docs references.
There are 2 commits. First one drops six - it is pretty big, but the changes are mostly very simple and mechanical.
Second one removes other mentions / workaround, unrelated to six.
The only concern I see here, is that the next pull from upstream is gonna be painful...
Beside that if all tests pass
Also why do this cleanup now ? and not wait for upstream to do it ?
The only concern I see here, is that the next pull from upstream is gonna be painful...
Beside that if all tests pass
Also why do this cleanup now ? and not wait for upstream to do it ?
I did open this PR in upstream too: https://github.com/datastax/python-driver/pull/1172 If they accept it, then all is well. If they don't - yes, next pull may be more difficult, but I wouldn't worry about that too much: there isn't that much activity in the upstream, and the resulting conflicts should be easy to resolve.
There isn't any burning reason to do the cleanup now - it just irks me to see all this unnecessary baggage so I want to get rid of it.
looks like upstream are gonna take it slowly...
maybe we should just merge it, if we confident enough with the changes, maybe it move upstream a bit faster knowing most of it was tested and released by us, merging from upstream next time would be painful
Actually I started to split upstream PR into multiple simple commits, so it's easier to review - maybe that'll speed things up?
Actually I started to split upstream PR into multiple simple commits, so it's easier to review - maybe that'll speed things up?
I'm o.k. with both options.
just a remark, once six is dropped in the driver, we don't need to have it in https://github.com/scylladb/scylla-cqlsh/blob/3332078f4a66ded92dd7144940aef93ca6edbb7a/bin/cqlsh.py#L119
@Lorak-mmk
upstream merged: https://github.com/datastax/python-driver/pull/1172
so we should be start a sync with upstream, and close this one