DM-7069: Port to Python 3 #19
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
timj
force-pushed
the
tickets/DM-7069
branch
2 times, most recently
from
cf841f3
to
5eb4cbe
Compare
timj
force-pushed
the
tickets/DM-7069
branch
3 times, most recently
from
3b6e71e
to
7cf2063
Compare
| @@ -65,7 +65,7 @@ def getDefaultLevel(self): | |||
| return 'visit' | |||
|
|
|||
| def getKeys(self, datasetType, level): | |||
| return {'filter': types.StringType, 'visit': types.IntType} | |||
| return {'filter': bytes, 'visit': int} | |||
There was a problem hiding this comment.
why bytes here and not str? (seems wrong, but maybe it's a new python3 thing I don't know about yet?)
There was a problem hiding this comment.
Thank you. With so many changes it's easy to miss some. futurize knows that types.StringType is a synonym for bytes and since StringType does not exist on python3 it just buts bytes in there.
There was a problem hiding this comment.
and of course this fixes my final test failure on Python 3.
timj
force-pushed
the
tickets/DM-7069
branch
2 times, most recently
from
3cb2a7c
to
f059b03
Compare
With some manual tweaks where futurize doesn't quite do the right thing. ReadProxy can not inherit from future object as this breaks the proxy on Python 2.
The interfaces are compatible so this just changes the namespace.
On Python 3 str has __iter__ so all the tests that are checking for an iterable in the codebase have to also be careful not to include str by mistake. Refactor the code that looks for __iter__ to use routines from utils where possible. Where not possible add instance checks for string.
Use __file__ to find the test file and then derive repository locations from it.
Future object does not have an __init__ method so we have to catch that case in the MRO.
Python 3 collections.UserDict is iterable but not on Python 2. Python 2 requires we use UserDict.IterableUserDict so try that first and then revert to collections.
This allows the tests to be visible to the test runner and is better than globally disabling all testing in the file and hiding the tests.
Futurize converted types.StringType to bytes (technically correct on python2) when it should have converted to str.
The next() method is just a method that iterates but is not providing an iterable interface allowing the next() function to work.
pytest assumes that classes with names starting with Test are test classes that should be analyzed for test methods. When it can't find any it warns that something might be wrong. Rename the tests to remove the warnings.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is for Python 3 work and other cleanups.