Merge pull request #30 from mteodoro/ipv6_support

Added support for IPv6 ASN and City editions

pygeoip/__init__.py

@@ -126,9 +126,11 @@ class GeoIP(GeoIPBase):
         * REGION_EDITION_REV1
         * CITY_EDITION_REV0
         * CITY_EDITION_REV1
+        * CITY_EDITION_REV1_V6
         * ORG_EDITION
         * ISP_EDITION
         * ASNUM_EDITION
+        * ASNUM_EDITION_V6
 
         """
         self._databaseType = const.COUNTRY_EDITION
@@ -167,9 +169,11 @@ class GeoIP(GeoIPBase):
 
                 elif self._databaseType in (const.CITY_EDITION_REV0,
                                             const.CITY_EDITION_REV1,
+                                            const.CITY_EDITION_REV1_V6,
                                             const.ORG_EDITION,
                                             const.ISP_EDITION,
-                                            const.ASNUM_EDITION):
+                                            const.ASNUM_EDITION,
+                                            const.ASNUM_EDITION_V6):
                     self._databaseSegments = 0
                     buf = self._filehandle.read(const.SEGMENT_RECORD_LENGTH)
 
@@ -378,7 +382,7 @@ class GeoIP(GeoIPBase):
         record['latitude'] = (latitude / 10000.0) - 180.0
         record['longitude'] = (longitude / 10000.0) - 180.0
 
-        if self._databaseType == const.CITY_EDITION_REV1:
+        if self._databaseType in (const.CITY_EDITION_REV1, const.CITY_EDITION_REV1_V6):
             dmaarea_combo = 0
             if record['country_code'] == 'US':
                 for j in range(3):
@@ -525,7 +529,7 @@ class GeoIP(GeoIPBase):
             if not ipnum:
                 raise ValueError('Invalid IP address')
 
-            valid = (const.ORG_EDITION, const.ISP_EDITION, const.ASNUM_EDITION)
+            valid = (const.ORG_EDITION, const.ISP_EDITION, const.ASNUM_EDITION, const.ASNUM_EDITION_V6)
             if self._databaseType not in valid:
                 message = 'Invalid database type, expected Org, ISP or ASNum'
                 raise GeoIPError(message)

pygeoip/const.py

@@ -402,16 +402,18 @@ REGION_EDITION_REV0 = 7
 REGION_EDITION_REV1 = 3
 CITY_EDITION_REV0 = 6
 CITY_EDITION_REV1 = 2
+CITY_EDITION_REV1_V6 = 30
 ORG_EDITION = 5
 ISP_EDITION = 4
 ASNUM_EDITION = 9
+ASNUM_EDITION_V6 = 21
 # Not yet supported databases
 PROXY_EDITION = 8
 NETSPEED_EDITION = 11
 
 # Collection of databases
-IPV6_EDITIONS = (COUNTRY_EDITION_V6,)
-CITY_EDITIONS = (CITY_EDITION_REV0, CITY_EDITION_REV1)
+IPV6_EDITIONS = (COUNTRY_EDITION_V6, ASNUM_EDITION_V6, CITY_EDITION_REV1_V6)
+CITY_EDITIONS = (CITY_EDITION_REV0, CITY_EDITION_REV1, CITY_EDITION_REV1_V6)
 REGION_EDITIONS = (REGION_EDITION_REV0, REGION_EDITION_REV1)
 REGION_CITY_EDITIONS = REGION_EDITIONS + CITY_EDITIONS