diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-02 18:59:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-02 18:59:11 +0000 |
| commit | 78e33b81215ce3f9eff141df5eb171e107b4d315 (patch) | |
| tree | 8e925d800e27f7a70c2b6a131b14526bc0f095b5 /Lib/fontTools/misc/xmlWriter.py | |
| parent | d350b6e23c78177a56f4f18831d9d78f4a30ce3f (diff) | |
| parent | d11d71b9408f76f20ef05bc09f69127d138d9a65 (diff) | |
| download | fonttools-78e33b81215ce3f9eff141df5eb171e107b4d315.tar.gz | |
Upgrade fonttools to 4.22.0 am: 6cf80b8fa7 am: d11d71b940
Original change: https://android-review.googlesource.com/c/platform/external/fonttools/+/1662591
Change-Id: I658fdb81cfb90b7929346bb21f6847c4059d46b9
Diffstat (limited to 'Lib/fontTools/misc/xmlWriter.py')
| -rw-r--r-- | Lib/fontTools/misc/xmlWriter.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Lib/fontTools/misc/xmlWriter.py b/Lib/fontTools/misc/xmlWriter.py index 6ab8469e..fec127a9 100644 --- a/Lib/fontTools/misc/xmlWriter.py +++ b/Lib/fontTools/misc/xmlWriter.py @@ -1,6 +1,6 @@ """xmlWriter.py -- Simple XML authoring class""" -from fontTools.misc.py23 import * +from fontTools.misc.py23 import byteord, strjoin, tobytes, tostr import sys import os import string @@ -34,8 +34,8 @@ class XMLWriter(object): self.totype = tobytes except TypeError: # This better not fail. - self.file.write(tounicode('')) - self.totype = tounicode + self.file.write('') + self.totype = tostr self.indentwhite = self.totype(indentwhite) if newlinestr is None: self.newlinestr = self.totype(os.linesep) @@ -156,7 +156,7 @@ class XMLWriter(object): return "" data = "" for attr, value in attributes: - if not isinstance(value, (bytes, unicode)): + if not isinstance(value, (bytes, str)): value = str(value) data = data + ' %s="%s"' % (attr, escapeattr(value)) return data |