Merge pull request #6 from vatsan/master

Fixed bug in __init__.py line 294 (NoneType not iterable).

pygeoip/__init__.py

@@ -295,8 +295,8 @@ class GeoIP(GeoIPBase):
 
         elif self._databaseType in (const.CITY_EDITION_REV0, const.CITY_EDITION_REV1):
             rec = self._get_record(ipnum)
-            country_code = rec['country_code'] if 'country_code' in rec else ''
-            region = rec['region_name'] if 'region_name' in rec else ''
+            country_code = rec['country_code'] if rec and 'country_code' in rec else ''
+            region = rec['region_name'] if rec and 'region_name' in rec else ''
 
         return {'country_code' : country_code, 'region_name' : region }