From 2a6be6884101995d490449147873841c20e8dc1b Mon Sep 17 00:00:00 2001
From: Doug Felt <dougfelt@google.com>
Date: Wed, 16 Mar 2016 16:48:39 -0700
Subject: [PATCH] fixes for review
---
generate_emoji_html.py | 37 ++-----------------------------------
1 file changed, 2 insertions(+), 35 deletions(-)
diff --git a/generate_emoji_html.py b/generate_emoji_html.py
index 4f2fc3029..e33bcc1b5 100755
--- a/generate_emoji_html.py
+++ b/generate_emoji_html.py
@@ -94,7 +94,7 @@ def _get_name(key_tuple):
if cp in unicode_data.proposed_emoji_cps():
name = '(proposed) ' + unicode_data.proposed_emoji_name(cp)
else:
- name =unicode_data.name(cp, '(error)')
+ name = unicode_data.name(cp, '(error)')
return CELL_PREFIX + name
@@ -116,39 +116,6 @@ def _generate_content(dir_infos):
return '\n <tr>'.join(lines) + '\n</table>'
-"""
-def _generate_content(files, prefix=_default_prefix):
- key_to_filename = {}
- for fname in files:
- filename = path.basename(fname)
- if not filename.startswith(prefix):
- print >> sys.stderr, 'bad prefix for filename %s' % fname
- continue
- key_string = path.splitext(filename)[0]
- key_string = key_string[len(prefix):]
- try:
- key_tuple = tuple(int(k, 16) for k in key_string.split('_'))
- except:
- print 'bad filename: "%s"' % key_string
- key_to_filename[key_tuple] = fname
-
- lines = ["<table>"]
- for key_tuple in sorted(key_to_filename):
- if len(key_tuple) == 1:
- key_string = 'U+%04X' % key_tuple
- else:
- key_string = ' + '.join(
- '<img src="%s">' % key_to_filename[tuple([key])]
- for key in key_tuple
- if tuple([key]) in key_to_filename)
- name = _get_name(key_tuple)
- lines.append('<tr><td><img src="%s"><td class="desc">'
- '%s<td class="name">'
- '%s' % (
- key_to_filename[key_tuple], key_string, name))
- return '\n '.join(lines) + '\n<table>'
-"""
-
def _get_image_data(image_dir, ext, prefix):
"""Return a map from a tuple of cp sequences to a filename.
@@ -166,7 +133,7 @@ def _get_image_data(image_dir, ext, prefix):
if not m:
if filename.startswith('unknown_flag.'):
continue
- fails.append('"%s" did not match: "%s"' % (expect_re, filename))
+ fails.append('"%s" did not match: "%s"' % (expect_re.pattern, filename))
continue
seq = m.group(1)
try: