diff -r 176c26a21123 -r 99d5424eedc8 contrib/import-checker.py
--- a/contrib/import-checker.py	Thu Nov 01 15:47:26 2018 -0400
+++ b/contrib/import-checker.py	Thu Nov 01 15:43:43 2018 -0400
@@ -674,6 +674,8 @@
         # "starts" is "line number" (1-origin), but embedded() is
         # expected to return "line offset" (0-origin). Therefore, this
         # yields "starts - 1".
+        if not isinstance(modname, str):
+            modname = modname.decode('utf8')
         yield code, "%s[%d]" % (modname, starts), name, starts - 1
 
 def sources(f, modname):