tjh.dev
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1--- a/bin/scfbuild
2+++ b/bin/scfbuild
3@@ -1,4 +1,4 @@
4-#!/usr/bin/env python2
5+#!/usr/bin/env python3
6 # -*- coding: utf-8 -*-
7
8 from __future__ import (absolute_import, division, print_function,
9--- a/scfbuild/builder.py
10+++ b/scfbuild/builder.py
11@@ -287,8 +287,8 @@ def _add_name_record(self, text, name_id, platform_id, plat_enc_id, lang_id):
12 # TODO: The installed version of fontTools doesn't have
13 # table__n_a_m_e.setName().
14 record = NameRecord()
15- # PyYAML creates strings, force to Unicode
16- record.string = unicode(text)
17+ # PyYAML creates strings, which are unicode as of Python3
18+ record.string = text
19 record.nameID = name_id
20 record.platformID = platform_id
21 record.platEncID = plat_enc_id
22--- a/scfbuild/fforge.py
23+++ b/scfbuild/fforge.py
24@@ -84,7 +84,7 @@ def add_glyphs(font, svg_filepaths, conf):
25 u_ids = [int(u_id, 16) for u_id in filename.split("-")]
26 # Example: (0x1f441, 0x1f5e8)
27
28- u_str = ''.join(map(unichr, u_ids))
29+ u_str = ''.join(map(chr, u_ids))
30 # Example: "U\0001f441U\0001f5e8"
31
32 # Replace sequences with correct ZWJ/VS16 versions as needed
33--- a/scfbuild/main.py
34+++ b/scfbuild/main.py
35@@ -1,4 +1,4 @@
36-#!/usr/bin/env python2
37+#!/usr/bin/env python3
38 # -*- coding: utf-8 -*-
39
40 # SCFBuild is released under the GNU General Public License v3.
41index 0000000..99418b5
42--- /dev/null
43+++ b/scfbuild/requirements.txt
44@@ -0,0 +1,2 @@
45+fonttools>=3.41.2
46+PyYAML>=5.1