Update test_city.py and test_region.py ( Boris Zenter )

borisz · borisz · commit f1e3d7eae27c · 2008-08-06T23:24:37.000Z
Add region_name to GeoIPRegion ( Boris Zentner )
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,5 @@
+	* Update test_city.py and test_region.py ( Boris Zentner )
+	* Add region_name to GeoIPRegion ( Boris Zentner )
 	* Add database_info and database_edition attributes to GeoIP object
 		(James Henstridge)
 	* Add region_name and time_zone keys to GeoIPRecord wrapper (James
diff --git a/py_GeoIP.c b/py_GeoIP.c
@@ -181,9 +181,14 @@ void GeoIP_SetItemInt(PyObject *dict, const char * name, int value) {
 
 static PyObject * GeoIP_region_populate_dict(GeoIPRegion * gir) {
   PyObject * retval;
+  const char * region_name = NULL;
   retval = PyDict_New();
   GeoIP_SetItemString(retval,"country_code",gir->country_code);
   GeoIP_SetItemString(retval,"region",gir->region);
+  if ( gir->country_code[0] ) {
+    region_name = GeoIP_region_name_by_code(gir->country_code, gir->region);
+  }
+  GeoIP_SetItemString(retval,"region_name",region_name);
   GeoIPRegion_delete(gir);
   return retval;
 }
@@ -201,10 +206,10 @@ static PyObject * GeoIP_populate_dict(GeoIPRecord *gir) {
 	GeoIP_SetItemFloat(retval,"longitude",gir->longitude);
 	GeoIP_SetItemInt(retval,"dma_code",gir->dma_code);
 	GeoIP_SetItemInt(retval,"area_code",gir->area_code);
-  GeoIP_SetItemString(retval, "region_name",
-      GeoIP_region_name_by_code(gir->country_code, gir->region));
-  GeoIP_SetItemString(retval, "time_zone",
-      GeoIP_time_zone_by_country_and_region(gir->country_code, gir->region));
+	GeoIP_SetItemString(retval, "region_name",
+	  GeoIP_region_name_by_code(gir->country_code, gir->region));
+	GeoIP_SetItemString(retval, "time_zone",
+	  GeoIP_time_zone_by_country_and_region(gir->country_code, gir->region));
 	GeoIPRecord_delete(gir);
 	return retval;
 }
diff --git a/test_city.py b/test_city.py
@@ -11,10 +11,12 @@
 	print gir['country_code']
 	print gir['country_code3']
 	print gir['country_name']
-	print gir['region']
 	print gir['city']
+	print gir['region']
+	print gir['region_name']
 	print gir['postal_code']
 	print gir['latitude']
 	print gir['longitude']
 	print gir['dma_code']
 	print gir['area_code']
+	print gir['time_zone']
diff --git a/test_region.py b/test_region.py
@@ -7,9 +7,12 @@
 gir = gi.region_by_name("www.google.com")
 if gir != None:
             print gir['country_code']
-            print gir['region']
 
+            print gir['region']
+            print gir['region_name']
 gir = gi.region_by_addr("24.24.24.24")
 if gir != None:
             print gir['country_code']
             print gir['region']
+            print gir['region_name']
+	    

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+ * Update test_city.py and test_region.py ( Boris Zentner )`
	`2`	`+ * Add region_name to GeoIPRegion ( Boris Zentner )`
`1`	`3`	`* Add database_info and database_edition attributes to GeoIP object`
`2`	`4`	`(James Henstridge)`
`3`	`5`	`* Add region_name and time_zone keys to GeoIPRecord wrapper (James`