Revert "Deprecate and ignore newlinestr"
This reverts commit 5af178ac8eb2da79b965be5c6cee693dad602c65.
This commit is contained in:
parent
01b0180ce1
commit
094a40ca2e
@ -4,7 +4,6 @@ from fontTools.misc.py23 import byteord, strjoin, tobytes, tostr
|
|||||||
import sys
|
import sys
|
||||||
import os
|
import os
|
||||||
import string
|
import string
|
||||||
import warnings
|
|
||||||
|
|
||||||
INDENT = " "
|
INDENT = " "
|
||||||
|
|
||||||
@ -38,12 +37,10 @@ class XMLWriter(object):
|
|||||||
self.file.write('')
|
self.file.write('')
|
||||||
self.totype = tostr
|
self.totype = tostr
|
||||||
self.indentwhite = self.totype(indentwhite)
|
self.indentwhite = self.totype(indentwhite)
|
||||||
if newlinestr != "\n":
|
if newlinestr is None:
|
||||||
warnings.warn(
|
self.newlinestr = self.totype(os.linesep)
|
||||||
'Setting "newlinestr" is deprecated and will be ignored.',
|
else:
|
||||||
DeprecationWarning,
|
self.newlinestr = self.totype(newlinestr)
|
||||||
)
|
|
||||||
self.newlinestr = self.totype("\n")
|
|
||||||
self.indentlevel = 0
|
self.indentlevel = 0
|
||||||
self.stack = []
|
self.stack = []
|
||||||
self.needindent = 1
|
self.needindent = 1
|
||||||
|
@ -159,7 +159,8 @@ class table__g_l_y_f(DefaultTable.DefaultTable):
|
|||||||
suffix=ext)
|
suffix=ext)
|
||||||
existingGlyphFiles.add(glyphPath.lower())
|
existingGlyphFiles.add(glyphPath.lower())
|
||||||
glyphWriter = xmlWriter.XMLWriter(
|
glyphWriter = xmlWriter.XMLWriter(
|
||||||
glyphPath, idlefunc=writer.idlefunc)
|
glyphPath, idlefunc=writer.idlefunc,
|
||||||
|
newlinestr=writer.newlinestr)
|
||||||
glyphWriter.begintag("ttFont", ttLibVersion=version)
|
glyphWriter.begintag("ttFont", ttLibVersion=version)
|
||||||
glyphWriter.newline()
|
glyphWriter.newline()
|
||||||
glyphWriter.begintag("glyf")
|
glyphWriter.begintag("glyf")
|
||||||
|
@ -271,7 +271,8 @@ class TTFont(object):
|
|||||||
tag = tables[i]
|
tag = tables[i]
|
||||||
if splitTables:
|
if splitTables:
|
||||||
tablePath = fileNameTemplate % tagToIdentifier(tag)
|
tablePath = fileNameTemplate % tagToIdentifier(tag)
|
||||||
tableWriter = xmlWriter.XMLWriter(tablePath)
|
tableWriter = xmlWriter.XMLWriter(tablePath,
|
||||||
|
newlinestr=writer.newlinestr)
|
||||||
tableWriter.begintag("ttFont", ttLibVersion=version)
|
tableWriter.begintag("ttFont", ttLibVersion=version)
|
||||||
tableWriter.newline()
|
tableWriter.newline()
|
||||||
tableWriter.newline()
|
tableWriter.newline()
|
||||||
|
@ -115,7 +115,7 @@ class TestXMLWriter(unittest.TestCase):
|
|||||||
writer.write("world")
|
writer.write("world")
|
||||||
writer.newline()
|
writer.newline()
|
||||||
|
|
||||||
linesep = tobytes('\n')
|
linesep = tobytes(os.linesep) if nls is None else tobytes(nls)
|
||||||
|
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
header + linesep + b"hello" + linesep + b"world" + linesep,
|
header + linesep + b"hello" + linesep + b"world" + linesep,
|
||||||
|
@ -354,7 +354,7 @@ class NameRecordTest(unittest.TestCase):
|
|||||||
writer = XMLWriter(BytesIO())
|
writer = XMLWriter(BytesIO())
|
||||||
name.toXML(writer, ttFont=None)
|
name.toXML(writer, ttFont=None)
|
||||||
xml = writer.file.getvalue().decode("utf_8").strip()
|
xml = writer.file.getvalue().decode("utf_8").strip()
|
||||||
return xml.split("\n")[1:]
|
return xml.split(writer.newlinestr.decode("utf_8"))[1:]
|
||||||
|
|
||||||
def test_toXML_utf16be(self):
|
def test_toXML_utf16be(self):
|
||||||
name = makeName("Foo Bold", 111, 0, 2, 7)
|
name = makeName("Foo Bold", 111, 0, 2, 7)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user