Use dynamic __import__ rather than lots of generated import fns

daviddrysdale · daviddrysdale · commit a0e87ae6a639 · 2013-02-25T19:52:16.000Z
diff --git a/python/phonenumbers/phonemetadata.py b/python/phonenumbers/phonemetadata.py
@@ -229,7 +229,7 @@ def metadata_for_region(kls, region_code, default=None):
         loader = kls._region_available.get(region_code, None)
         if loader is not None:
             # Region metadata is available but has not yet been loaded.  Do so now.
-            loader()
+            loader(region_code)
             kls._region_available[region_code] = None
         return kls._region_metadata.get(region_code, default)
 
@@ -238,7 +238,7 @@ def metadata_for_nongeo_region(kls, country_code, default=None):
         loader = kls._country_code_available.get(country_code, None)
         if loader is not None:
             # Region metadata is available but has not yet been loaded.  Do so now.
-            loader()
+            loader(country_code)
             kls._country_code_available[country_code] = None
         return kls._country_code_metadata.get(country_code, default)
 
@@ -263,11 +263,11 @@ def load_all(kls):
         # Use .items() not .iteritems() because we would invalidate the iterator
         for region_code, loader in kls._region_available.items():
             if loader is not None:  # pragma no cover
-                loader()
+                loader(region_code)
                 kls._region_available[region_code] = None
         for country_code, loader in kls._country_code_available.items():
             if loader is not None:
-                loader()
+                loader(country_code)
                 kls._country_code_available[region_code] = None
 
     @mutating_method
diff --git a/tools/python/buildmetadatafromxml.py b/tools/python/buildmetadatafromxml.py
@@ -83,6 +83,18 @@ 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"
+METADATA_FILE_LOOP = '''
+def _load_region(code):
+    __import__("region_%s" % code, globals(), locals(),
+               fromlist=["PHONE_METADATA_%s" % code], level=1)
+
+for country_code in _AVAILABLE_NONGEO_COUNTRY_CODES:
+    PhoneMetadata.register_nongeo_region_loader(country_code, _load_region)
+
+for region_code in _AVAILABLE_REGION_CODES:
+    PhoneMetadata.register_region_loader(region_code, _load_region)
+'''
+
 _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.
@@ -521,17 +533,18 @@ def emit_metadata_py(self, datadir, module_prefix):
             prnt(METADATA_FILE_PROLOG, file=outfile)
             prnt(COPYRIGHT_NOTICE, file=outfile)
             prnt(METADATA_FILE_IMPORT % {'module': module_prefix}, file=outfile)
+            nongeo_codes = []
+            country_codes = []
             for country_id in sorted(self.territory.keys()):
                 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)
+                    nongeo_codes.append(country_id)  # int
                 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)
+                    country_codes.append("'%s'" % country_id)  # quoted string
+            prnt("_AVAILABLE_NONGEO_COUNTRY_CODES = [%s]" % ", ".join(nongeo_codes), file=outfile)
+            prnt("_AVAILABLE_REGION_CODES = [%s]" % ",".join(country_codes), file=outfile)
+            prnt(METADATA_FILE_LOOP, 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)
