Merge pull request #51 from maxmind/greg/network

Add support for getting the prefix length when looking up an IP

Author: horgh

.clang-format

@@ -0,0 +1,5 @@
+BasedOnStyle: LLVM
+IndentWidth: 4
+BinPackArguments: false
+BinPackParameters: false
+IndentCaseLabels: true

.uncrustify.cfg

@@ -14,6 +14,8 @@ History
   ``ipaddress.IPv6Address`` objects in addition to strings.  This works with
   both the pure Python implementation as well as the extension. Based on a
   pull request #48 by Eric Pruitt. GitHub #50.
+* A new method, ``get_with_prefix_len`` was added. This method returns a
+  tuple containing the record and the prefix length.
 
 1.4.1 (2018-06-22)
 ++++++++++++++++++

HISTORY.rst

@@ -62,6 +62,10 @@ corresponding values for the IP address from the database (e.g., a dictionary
 for GeoIP2/GeoLite2 databases). If the database does not contain a record for
 that IP address, the method will return ``None``.
 
+If you wish to also retrieve the prefix length for the record, use the
+``get_with_prefix_len`` method. This returns a tuple containing the record
+followed by the network prefix length associated with the record.
+
 Example
 -------
 
@@ -70,9 +74,13 @@ Example
     >>> import maxminddb
     >>>
     >>> reader = maxminddb.open_database('GeoLite2-City.mmdb')
+    >>>
     >>> reader.get('1.1.1.1')
     {'country': ... }
     >>>
+    >>> reader.get_with_prefix_len('1.1.1.1')
+    ({'country': ... }, 24)
+    >>>
     >>> reader.close()
 
 Exceptions

README.rst

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+format="clang-format -i -style=file"
+
+for dir in extension; do
+    c_files=`find $dir -maxdepth 1 -name '*.c'`
+    if [ "$c_files" != "" ]; then
+        $format $dir/*.c;
+    fi
+
+    h_files=`find $dir -maxdepth 1 -name '*.h'`
+    if [ "$h_files" != "" ]; then
+        $format $dir/*.h;
+    fi
+done

dev-bin/clang-format-all.sh

@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = 'maxminddb'
-copyright = '2013-2018, MaxMind, Inc.'
+copyright = '2013-2019, MaxMind, Inc.'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/conf.py

@@ -35,6 +35,6 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
-:copyright: (c) 2013-2018 by MaxMind, Inc.
+:copyright: (c) 2013-2019 by MaxMind, Inc.
 :license: Apache License, Version 2.0