Address Python 3.9 plistlib changes #74
Conversation
- drop py2.7 support (setup.py) - don't use `use_builtin_types` in `plistlib.loads` - use `bytes` instead of `plistlib.Data`
src/ufonormalizer.py
Outdated
| @@ -1293,7 +1294,7 @@ def _plistDate(self, data): | |||
| self.simpleElement("date", value=data) | |||
|
|
|||
| def _plistData(self, data): | |||
| data = data.asBase64(maxlinelength=xmlTextMaxLineLength) | |||
| data = base64.b64encode(data) | |||
There was a problem hiding this comment.
here you're losing the line wrapping when length exceeds xmlTestMaxLineLength.
You should implement something like this and use it here:
https://github.com/python/cpython/blob/3689c25a1010c2acdb05f1b1b0229f4766b4440a/Lib/plistlib.py#L112-L119
There was a problem hiding this comment.
and maybe also add a tests that exercises this line wrapping, because current tests didn't catch that
There was a problem hiding this comment.
Thanks @anthrotype. I'll make some changes.
Since this is turning out to be a bit more than a quick fix: I think I'll spend some time and do a more thorough update, there are still some conditional imports to support Python 2.7, etc. that should also be removed. Related: I'm thinking about putting some stuff in that will require Python 3.6 minimum, seeing as how Python 3.5 support recently ended. Anyone have concerns about that? @typesupply @benkiel
There was a problem hiding this comment.
Anyone have concerns about that?
I don't have any concerns.
|
Python 3.5 is EOL, it can be safely dropped by now |
- add flake8 install - remove Python 2.7 - add Python 3.7, 3.8, and 3.9 - add flake8 to script
- cleaned up many, many flake8 issues (formatting, unused imports, line lengths, ...) - fixed some additional issues such as mutable data structures for arg defaults - purged code used to support Python < 3.6 - implement _encode_base64 (and _decode_base64) per review - added test to check text wrapping
|
@anthrotype @benkiel and anyone else who wants to chime in: I made the changes requested (and more). The Travis check on Python 3.8 is failing in a very odd way that I don't really understand. I can't repro it here, some weird glitch. I think it's okay so hoping you can overlook that in your review. Related: Ben has given me admin access, which I'll use to implement GitHub Actions and ditch TravisCI once this PR is sorted. |
|
@josh-hadley this looks good to me, and yes that Python 3.8 error is super weird, will overlook. Going to merge this, once GhitHub actions is in place we can cut a release. Thank you so much for taking care of this. |
|
Sure thing, @benkiel . If someone from the unified-font-object org can add org- or repo-level secrets with the PyPI token (as e.g. PYPI_PASSWORD) I can set up a few GitHub Action workflows for testing, making a release (including publishing to PyPI). I've set this up for our AFDKO and psautohint repos and it's super-handy; basically all you have to do to make a release is push a tag with the version (will need to make a few minor tweaks to the code to handle scm versioning). |
|
@josh-hadley done! |
To reflect changes made in unified-font-object#74
use_builtin_typesinplistlib.loadsbytesinstead ofplistlib.Datacloses #73