Add MCC/MNC support

Author: oschwald

HISTORY.rst

@@ -1,8 +1,19 @@
+
 .. :changelog:
 
 History
 -------
 
+4.5.0
+++++++++++++++++++
+
+* Support for mobile country code (MCC) and mobile network codes (MNC) was
+  added for the GeoIP2 ISP and Enterprise databases as well as the GeoIP2
+  City and Insights web services. ``mobile_country_code`` and
+  ``mobile_network_code`` attributes were added to ``geoip2.model.ISP``
+  for the GeoIP2 ISP database and ``geoip2.record.Traits`` for the
+  Enterprise database and the GeoIP2 City and Insights web services.
+
 4.4.0 (2021-09-24)
 ++++++++++++++++++
 

geoip2/models.py

@@ -577,6 +577,23 @@ class ISP(ASN):
 
       :type: unicode
 
+    .. attribute: mobile_country_code
+
+      The `mobile country code (MCC)
+      <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
+      IP address and ISP.
+
+      :type: str
+
+    .. attribute: mobile_network_code
+
+      The `mobile network code (MCC)
+      <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
+      IP address and ISP.
+
+      :type: str
+
+
     .. attribute:: organization
 
       The name of the organization associated with the IP address.
@@ -599,10 +616,14 @@ class ISP(ASN):
     """
 
     isp: Optional[str]
+    mobile_country_code: Optional[str]
+    mobile_network_code: Optional[str]
     organization: Optional[str]
 
     # pylint:disable=too-many-arguments
     def __init__(self, raw: Dict[str, Union[str, int]]) -> None:
         super().__init__(raw)
         self.isp = cast(Optional[str], raw.get("isp"))
+        self.mobile_country_code = cast(Optional[str], raw.get("mobile_country_code"))
+        self.mobile_network_code = cast(Optional[str], raw.get("mobile_network_code"))
         self.organization = cast(Optional[str], raw.get("organization"))

geoip2/records.py

@@ -713,7 +713,7 @@ class Traits(Record):
 
     .. attribute:: is_tor_exit_node
 
-      This is true if the IP address is a Tor exit node.  This attribute is
+      This is true if the IP address is a Tor exit node. This attribute is
       only available from GeoIP2 Precision Insights.
 
       :type: bool
@@ -726,6 +726,24 @@ class Traits(Record):
 
       :type: unicode
 
+    .. attribute: mobile_country_code
+
+      The `mobile country code (MCC)
+      <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
+      IP address and ISP. This attribute is available from the City and
+      Insights web services and the GeoIP2 Enterprise database.
+
+      :type: str
+
+    .. attribute: mobile_network_code
+
+      The `mobile network code (MCC)
+      <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
+      IP address and ISP. This attribute is available from the City and
+      Insights web services and the GeoIP2 Enterprise database.
+
+      :type: str
+
     .. attribute:: network
 
       The network associated with the record. In particular, this is the
@@ -808,6 +826,8 @@ class Traits(Record):
     is_tor_exit_node: bool
     isp: Optional[str]
     ip_address: Optional[str]
+    mobile_country_code: Optional[str]
+    mobile_network_code: Optional[str]
     organization: Optional[str]
     static_ip_score: Optional[float]
     user_count: Optional[int]
@@ -838,6 +858,8 @@ def __init__(
         static_ip_score: Optional[float] = None,
         user_count: Optional[int] = None,
         user_type: Optional[str] = None,
+        mobile_country_code: Optional[str] = None,
+        mobile_network_code: Optional[str] = None,
         **_,
     ) -> None:
         self.autonomous_system_number = autonomous_system_number
@@ -854,6 +876,8 @@ def __init__(
         self.is_satellite_provider = is_satellite_provider
         self.is_tor_exit_node = is_tor_exit_node
         self.isp = isp
+        self.mobile_country_code = mobile_country_code
+        self.mobile_network_code = mobile_network_code
         self.organization = organization
         self.static_ip_score = static_ip_score
         self.user_type = user_type

tests/database_test.py

@@ -199,27 +199,36 @@ def test_enterprise(self) -> None:
                 record.traits.network, ipaddress.ip_network("74.209.16.0/20")
             )
 
-    def test_isp(self) -> None:
-        reader = geoip2.database.Reader("tests/data/test-data/GeoIP2-ISP-Test.mmdb")
+            record = reader.enterprise("149.101.100.0")
 
-        ip_address = "1.128.0.0"
-        record = reader.isp(ip_address)
-        self.assertEqual(record, eval(repr(record)), "ISP repr can be eval'd")
+            self.assertEqual(record.traits.mobile_country_code, "310")
+            self.assertEqual(record.traits.mobile_network_code, "004")
 
-        self.assertEqual(record.autonomous_system_number, 1221)
-        self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")
-        self.assertEqual(record.isp, "Telstra Internet")
-        self.assertEqual(record.organization, "Telstra Internet")
-        self.assertEqual(record.ip_address, ip_address)
-        self.assertEqual(record.network, ipaddress.ip_network("1.128.0.0/11"))
+    def test_isp(self) -> None:
+        with geoip2.database.Reader(
+            "tests/data/test-data/GeoIP2-ISP-Test.mmdb"
+        ) as reader:
+            ip_address = "1.128.0.0"
+            record = reader.isp(ip_address)
+            self.assertEqual(record, eval(repr(record)), "ISP repr can be eval'd")
+
+            self.assertEqual(record.autonomous_system_number, 1221)
+            self.assertEqual(record.autonomous_system_organization, "Telstra Pty Ltd")
+            self.assertEqual(record.isp, "Telstra Internet")
+            self.assertEqual(record.organization, "Telstra Internet")
+            self.assertEqual(record.ip_address, ip_address)
+            self.assertEqual(record.network, ipaddress.ip_network("1.128.0.0/11"))
+
+            self.assertRegex(
+                str(record),
+                r"ISP\(\{.*Telstra.*\}\)",
+                "ISP str representation is reasonable",
+            )
 
-        self.assertRegex(
-            str(record),
-            r"ISP\(\{.*Telstra.*\}\)",
-            "ISP str representation is reasonable",
-        )
+            record = reader.isp("149.101.100.0")
 
-        reader.close()
+            self.assertEqual(record.mobile_country_code, "310")
+            self.assertEqual(record.mobile_network_code, "004")
 
     def test_context_manager(self) -> None:
         with geoip2.database.Reader(