514 Commits

Author SHA1 Message Date
Cosimo Lupo
6072fe1802
plistlib: rename some private functions
to better match the plist element names they are meant to construct
2018-07-21 18:34:27 +01:00
Cosimo Lupo
ab3e069a25
test_plistlib: parametrize tests with use_builtin_types option 2018-07-20 19:25:19 +01:00
Cosimo Lupo
5dcf204729
plistlib: add use_builtin_types option
Fixes https://github.com/unified-font-object/ufoLib/issues/162
2018-07-20 19:20:33 +01:00
Cosimo Lupo
0602e1fe7b
Release 2.3.0 2018-07-16 15:08:35 +02:00
Cosimo Lupo
bced5b62b9
Bump version: 2.2.5.dev0 → 2.3.0.dev0 2018-07-16 15:01:32 +02:00
Cosimo Lupo
42a3428d0f
writeLayerContents: make sure bytes strings in layerOrder are decoded
looks like defcon LayerSet.newLayer does not ensure the 'name' argument is a unicode
string, so serializing the layercontents.plist with the new ufoLib.plistlib may
lead to the layer name being encoded as a <data> element instead of a <string>.

Thanks Miguel for noticing this.
2018-07-15 21:32:13 +01:00
Cosimo Lupo
e15d56a2d3
test_etree: add test for pretty_print=True with ordered dict 2018-07-15 13:55:01 +01:00
Cosimo Lupo
bc7494b7f0
test_etree: start adding some unit tests to etree module 2018-07-15 12:32:17 +01:00
Cosimo Lupo
0c0d46e53b
etree: pretty_print is False by default (like in lxml) 2018-07-15 12:31:11 +01:00
Cosimo Lupo
6c6b94a580
etree: restrict py2 bytes to ASCII only 2018-07-14 20:06:22 +01:00
Cosimo Lupo
abe74f1edc
aarg! fix writeDataFileAtomically not removing empty file...
this had been broken for years, since commit 66e5ae02
2018-07-14 19:58:38 +01:00
Cosimo Lupo
b44e3d5087
validators: fixup doctests after adding unicode_literals 2018-07-14 19:42:16 +01:00
Cosimo Lupo
0951e2063e
ensure all modules do from __future__ import absolute_import, unicode_literals 2018-07-14 19:25:18 +01:00
Cosimo Lupo
83e8da2206
etree: only write self-closing <tag/> when element.text is None
like lxml does
2018-07-14 17:58:44 +01:00
Cosimo Lupo
1a94fbc121
etree: in invalid xml chars allow surrogates for 'narrow' pythons 2018-07-14 14:31:52 +01:00
Cosimo Lupo
5f61bcfcb4
etree: simplify regex for invalid xml chars 2018-07-14 14:07:42 +01:00
Cosimo Lupo
eea1766d9a
etree: fix valid XML regex for narrow UCS-2 only pythons
fixes https://ci.appveyor.com/project/adrientetar/ufolib/build/1.0.489/job/epryi911juu5lqdl#L72
2018-07-14 13:41:19 +01:00
Cosimo Lupo
d1fa34e72c
test_plistlib.py: mute harmless ResourceWarning on py27 2018-07-14 12:22:42 +01:00
Cosimo Lupo
59ac1aa357
test_plistlib: use ufoLib.etree 2018-07-13 18:50:02 +01:00
Cosimo Lupo
a9a37818cb
glifLib: use ufoLib.etree 2018-07-13 18:49:21 +01:00
Cosimo Lupo
a99a6d6ee5
plistlib: make signledispatch optional; use ufoLib.etree 2018-07-13 18:48:21 +01:00
Cosimo Lupo
d87c4edfe1
ufoLib.etree: add shim module that exports ElementTree API
works with both lxml and xml.etree backends

adds some missing things from built-in etree, such as the ability to
use an OrderedDict for attributes, support for pretty_print argument
to add indentation, etc.
2018-07-13 18:44:11 +01:00
Cosimo Lupo
49a88d6cbf
test_plistlib: must open plist as binary file
fixes https://ci.appveyor.com/project/adrientetar/ufolib/build/1.0.484/job/9em92wjinypwn2fu#L399
2018-07-12 14:10:48 +01:00
Cosimo Lupo
b743ccd2b6
utils: remove testing warning from doctest; fails with py27
I hate doctests :(
2018-07-12 13:54:19 +01:00
Cosimo Lupo
72a99726f7
test_plistlib: test deprecated readPlist/writePlist etc. as well 2018-07-12 13:47:23 +01:00
Cosimo Lupo
d664f31a50
plistlib: restore old readPlist/writePlist etc., with deprecation warning 2018-07-12 13:37:38 +01:00
Cosimo Lupo
c6bc1cda0a
add utils.py module with @deprecated decorator 2018-07-12 13:33:21 +01:00
Cosimo Lupo
460c08286d
test_plistlib: add test for pretty_print=False 2018-07-11 18:33:10 +01:00
Cosimo Lupo
8011e828dd
glifLib: call plistlib.totree with intent_level=2
since 'lib' element is itself contained in 'glyph' root element
2018-07-11 18:32:37 +01:00
Cosimo Lupo
790876da04
plistlib: justify multiline base64 data; add 'pretty_print' option
we right-justifiy binary data text to max 76 chars (min 16) per line
similarly to the way the stdlib plistlib module does (although they
use tabs for indentation, equivalent to 8-spaces).

We write the plist doctype ourselves, otherwise lxml always adds a
newline to it (even wen pretty_print is False).
2018-07-11 18:27:12 +01:00
Cosimo Lupo
a8124a0eef
plistlib: use double-quotes in xml declaration
for consistency with glifLib
2018-07-11 13:29:54 +01:00
Cosimo Lupo
61c19acace
Add test_plistlib.py
this is basically the same cpython plistlib test suite,
rewritten as pytest-style tests
2018-07-11 12:48:14 +01:00
Cosimo Lupo
01269bfee7
test: replace all readPlist/writePlist with load/dump 2018-07-11 12:30:11 +01:00
Cosimo Lupo
584666ffe9
glifLib: use new plistlib load/dump/totree/fromtree 2018-07-11 12:29:18 +01:00
Cosimo Lupo
0b15b7d61e
ufoLib: use new plistlib load/dump instead of readPlist/writePlist 2018-07-11 12:28:26 +01:00
Cosimo Lupo
0776e9405c
remove ufoLib.plistFromETree, superseded by new plistlib 2018-07-11 12:27:47 +01:00
Cosimo Lupo
715d6c6b68
Add plistlib module from ufoLib2
https://github.com/fonttools/ufoLib2/blob/master/src/ufoLib2/plistlib.py

replaces the old ufoLib.plistlib shim, privides a single interface
similar to python3's stdlib `plistlib` module, but built on top of
lxml.

On python < 3, it requires the singledispatch backport.
This will be added as conditional installation requirement.
2018-07-11 12:26:00 +01:00
Cosimo Lupo
657b4cf496
test_glifLib: add test to check double-quoted XML_DECLARATION 2018-07-10 18:56:30 +01:00
Cosimo Lupo
cdbb2d6b30
glifLib: use double quotes in XML declaration like old ufoLib
fixes #158
2018-07-10 18:56:30 +01:00
Cosimo Lupo
b3b495153b
Bump version: 2.2.4 → 2.2.5.dev0 2018-07-10 16:24:02 +01:00
Cosimo Lupo
46d11299b0
Release 2.2.4 2018-07-10 16:18:13 +01:00
Cosimo Lupo
1780a11b99
test_glifLib: add basic roundtrip test for read/write glif/string functions 2018-07-10 16:02:47 +01:00
Cosimo Lupo
4cb26a3521
_glifTreeFromString: ensure we pass UTF-8 bytes to etree.fromstring
Fixes https://travis-ci.org/robofab-developers/fontParts/jobs/402178235#L499

Instead of passing a unicode string to lxml.etree.fromstring, which must not have
an XML declaration containing an explicit encoding, we now pass a UTF-8 bytes string.
The latter may or may not have the xml declaration. If it doesn't, UTF-8 is implied
by lxml parser (libxml2 defaults to UTF-8 internally).
2018-07-10 15:39:58 +01:00
Cosimo Lupo
489c6baa02
Bump version: 2.2.3 → 2.2.4.dev0 2018-07-10 12:51:14 +01:00
Cosimo Lupo
754b89fbaf
Release 2.2.3 2018-07-10 12:50:45 +01:00
Cosimo Lupo
586b83c1f1
Merge pull request #157 from anthrotype/xml-declaration
add the default xml declaration in writeGlyphToString
2018-07-10 13:47:00 +02:00
Cosimo Lupo
864bb26eb4
glifLib: avoid re-encoding str to utf-8 when writing to file
the writeGlyphToString will still return a unicode string, like it's always done.
However, in the writeGlyph method we can call a private _writeGlyphToBytes and
write UTF-8 bytes directly instead of decoding them, then re-encoding them as
we write to the file.
2018-07-10 12:37:15 +01:00
Cosimo Lupo
c51ca22a6b
test_GLIF{1,2}: use itertools.islice to skip first line with xml declaration 2018-07-10 12:23:22 +01:00
Cosimo Lupo
7bbdf6eef2
test: skip first line in pyToGLIF helper function 2018-07-09 20:16:18 +01:00
Cosimo Lupo
8ad8f7631c
glifLib: writeGlyphToString must include the xml declaration
This is a regression from ufoLib v2.1.1, see

https://github.com/adobe-type-tools/afdko/pull/462#issuecomment-403577134
https://travis-ci.org/adobe-type-tools/afdko/jobs/401751859#L8427
2018-07-09 20:16:18 +01:00