diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-03 03:02:26 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-03 03:02:26 +0000 |
| commit | e76853bf40a5da5d1967ae174747408d080c17d6 (patch) | |
| tree | 8e925d800e27f7a70c2b6a131b14526bc0f095b5 /Lib/fontTools/misc/sstruct.py | |
| parent | 321ed118c46e7067f8b84839ef60df6533788645 (diff) | |
| parent | c1d5ba5438b639565b0c35ab2cd58555d0fa7645 (diff) | |
| download | fonttools-e76853bf40a5da5d1967ae174747408d080c17d6.tar.gz | |
Snap for 7256110 from c1d5ba5438b639565b0c35ab2cd58555d0fa7645 to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-releaseandroid12L-platform-releaseandroid12L-gsi
Change-Id: I2f204f122ad59bca8663ce4c0d538e5f18b59715
Diffstat (limited to 'Lib/fontTools/misc/sstruct.py')
| -rw-r--r-- | Lib/fontTools/misc/sstruct.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/fontTools/misc/sstruct.py b/Lib/fontTools/misc/sstruct.py index 8b69a429..ba1f8788 100644 --- a/Lib/fontTools/misc/sstruct.py +++ b/Lib/fontTools/misc/sstruct.py @@ -46,7 +46,7 @@ calcsize(fmt) it returns the size of the data in bytes. """ -from fontTools.misc.py23 import * +from fontTools.misc.py23 import tobytes, tostr from fontTools.misc.fixedTools import fixedToFloat as fi2fl, floatToFixed as fl2fi import struct import re @@ -68,7 +68,7 @@ def pack(fmt, obj): if name in fixes: # fixed point conversion value = fl2fi(value, fixes[name]) - elif isinstance(value, basestring): + elif isinstance(value, str): value = tobytes(value) elements.append(value) data = struct.pack(*(formatstring,) + tuple(elements)) |