Remove six #3497
Remove six #3497
Conversation
lib/iris/tests/unit/analysis/cartography/test__quadrant_area.py
Outdated
Show resolved
Hide resolved
|
Wasn't thinking clearly for d6363c4. Obviously need to provide alternative imports for these. |
This reverts commit 92eb188.
trexfeathers
force-pushed
the
remove_six
branch
from
7741083 to
bc8bf5e
Compare
|
Rebased on top of the work from #3505. |
|
Now need to resolve some more conflicts caused by #3507 |
| from six.moves import (filter, input, map, range, zip) # noqa | ||
|
|
||
| # Import iris tests first so that some things can be initialised | ||
| # import iris tests first so that some things can be initialised |
There was a problem hiding this comment.
This line has been changed in a couple places. The capitalisation and formatting seems to be fairly inconsistent throughout iris and it remains that way. I suppose this is mostly harmless (though perhaps it may do something odd with black when that gets merged).
stephenworsley
left a comment
stephenworsley
left a comment
There was a problem hiding this comment.
Looks good, just a couple minor things that might be worth tweaking.
| if kind == 'U': | ||
| value_type_name = 'unicode' | ||
| if kind == 'S': | ||
| value_type_name = 'bytes' |
There was a problem hiding this comment.
This block can probably be parsed more easily as:
if kind == 'S':
value_type_name = 'bytes'
else:
value_type_name = 'string'
| with self.assertRaisesRegex(TypeError, | ||
| # exactly == Py2, positional == Py3 | ||
| 'takes (exactly )?1 (positional )?' | ||
| 'argument '): |
There was a problem hiding this comment.
Should this string now be 'takes 1 positional argument '?
|
This has been replaced by #3509. |
3 participants
Don’t miss fc_rules_cf – non-Python file
Final files to change:
• requirements/setup.txt
• lib/scitools_iris.egg-info//requires.txt