pythonthings
diff --git a/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 12 additions & 1 deletion b/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 12 additions & 1 deletion
@@ -82,6 +82,7 @@ def u(s):
 
 # Boilerplate text for generated Python files
 METADATA_FILE_PROLOG = '"""Auto-generated file, do not edit by hand."""'
+METADATA_FILE_IMPORT = "from %(module)s.phonemetadata import PhoneMetadata\n"
 _COUNTRY_CODE_TO_REGION_CODE_PROLOG = '''
 # A mapping from a country code to the region codes which
 # denote the country/region represented by that country code.
@@ -519,8 +520,18 @@ def emit_metadata_py(self, datadir, module_prefix):
         with open(modulefilename, "w") as outfile:
             prnt(METADATA_FILE_PROLOG, file=outfile)
             prnt(COPYRIGHT_NOTICE, file=outfile)
+            prnt(METADATA_FILE_IMPORT % {'module': module_prefix}, file=outfile)
             for country_id in sorted(self.territory.keys()):
-                prnt("from .region_%s import PHONE_METADATA_%s" % (country_id, country_id), file=outfile)
+                terrobj = self.territory[country_id]
+                if terrobj.o.id == REGION_CODE_FOR_NON_GEO_ENTITY:
+                    prnt("def _load_nongeo_region_%s():" % country_id, file=outfile);
+                    prnt("    from .region_%s import PHONE_METADATA_%s" % (country_id, country_id), file=outfile)
+                    prnt("PhoneMetadata.register_nongeo_region_loader(%s, _load_nongeo_region_%s)" % (country_id, country_id), file=outfile)
+                else:
+                    prnt("def _load_region_%s():" % country_id, file=outfile);
+                    prnt("    from .region_%s import PHONE_METADATA_%s" % (country_id, country_id), file=outfile)
+                    prnt("PhoneMetadata.register_region_loader('%s', _load_region_%s)" % (country_id, country_id), file=outfile)
+                prnt("", file=outfile)
             if self.alt_territory is not None:
                 for country_code in sorted(self.alt_territory.keys()):
                     prnt("from .alt_format_%s import PHONE_ALT_FORMAT_%s" % (country_code, country_code), file=outfile)