From 247098465b151ab3a9e843b31a2b827edfeef15c Mon Sep 17 00:00:00 2001
From: Brian Cappello <briancappello@gmail.com>
Date: Thu, 29 Jun 2017 11:24:09 -0400
Subject: [PATCH] rename from_bytes to _from_bytes in generated font files

---
 font_to_py.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/font_to_py.py b/font_to_py.py
index 8c2d655..739abb0 100755
--- a/font_to_py.py
+++ b/font_to_py.py
@@ -494,37 +494,36 @@ class Font(dict):
 HEADER = """# Code generated by font-to-py.py.
 # Font: %(font)s
 version = '0.2'
-
-def from_bytes(data):
-    return int.from_bytes(data, 'little')
 """
 
 HEADER_CHARSET = """# Code generated by font-to-py.py.
 # Font: %(font)s
 version = '0.2'
 CHARSET = %(charset)s
+"""
 
-def from_bytes(data):
+FROM_BYTES = """\
+def _from_bytes(data):
     return int.from_bytes(data, 'little')
 """
 
-CHAR_BOUNDS = """\
+CHAR_BOUNDS = """
 def _char_bounds(ch):
     index = ord(ch) - %(minchar)d
     offset = 2 * index
-    start = from_bytes(_index[offset:offset+2])
+    start = _from_bytes(_index[offset:offset+2])
     next_offset = 2 * (index + 1)
-    end = from_bytes(_index[next_offset:next_offset+2])
+    end = _from_bytes(_index[next_offset:next_offset+2])
     return start, end
 """
 
-CHAR_BOUNDS_CHARSET = """\
+CHAR_BOUNDS_CHARSET = """
 def _char_bounds(ch):
     index = CHARSET[ch]
     offset = 2 * index
-    start = from_bytes(_index[offset:offset+2])
+    start = _from_bytes(_index[offset:offset+2])
     next_offset = 2 * (index + 1)
-    end = from_bytes(_index[next_offset:next_offset+2])
+    end = _from_bytes(_index[next_offset:next_offset+2])
     return start, end
 """
 
@@ -533,7 +532,7 @@ _mvfont = memoryview(_font)
 
 def get_char(ch):
     start, end = _char_bounds(ch)
-    width = from_bytes(_mvfont[start:start + 2])
+    width = _from_bytes(_mvfont[start:start + 2])
     return _mvfont[start + 2:end], %(height)s, width
 """
 
@@ -594,6 +593,7 @@ def write_data(stream, fnt, font_path, monospaced, hmap, lmap, reverse, charset)
     bw_index = ByteWriter(stream, '_index')
     bw_index.odata(index)
     bw_index.eot()
+    stream.write(FROM_BYTES)
     if sequential_charset:
         stream.write(CHAR_BOUNDS % {'minchar': ord(charset[0])})
     else: