Cleanup. Support Python 3

Author: James Oakley

Diff for: .gitignore

@@ -1,9 +1,8 @@
 *.pyc
-.tox/
+*.egg
+*.egg-info
+.*
 MANIFEST
 build/
 dist/
-*.egg-info/
-.eric?project/
-.issues/
-*.e4p
+*.json

Diff for: netfields/fields.py

@@ -1,9 +1,10 @@
 from netaddr import IPAddress, IPNetwork, EUI
 from netaddr.core import AddrFormatError
 
-from django import VERSION
+from django import VERSION as DJANGO_VERSION
 from django.db import models
 from django.core.exceptions import ValidationError
+from django.utils.six import with_metaclass
 
 from netfields.managers import NET_OPERATORS, NET_TEXT_OPERATORS
 from netfields.forms import InetAddressFormField, CidrAddressFormField, MACAddressFormField
@@ -65,18 +66,17 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(_NetAddressField, self).formfield(**defaults)
 
-    if VERSION[:2] >= (1, 7):
+    if DJANGO_VERSION[:2] >= (1, 7):
         def deconstruct(self):
             name, path, args, kwargs = super(_NetAddressField, self).deconstruct()
             if self.max_length is not None:
                 kwargs['max_length'] = self.max_length
             return name, path, args, kwargs
 
 
-class InetAddressField(_NetAddressField):
+class InetAddressField(with_metaclass(models.SubfieldBase, _NetAddressField)):
     description = "PostgreSQL INET field"
     max_length = 39
-    __metaclass__ = models.SubfieldBase
 
     def db_type(self, connection):
         return 'inet'
@@ -88,10 +88,9 @@ def form_class(self):
         return InetAddressFormField
 
 
-class CidrAddressField(_NetAddressField):
+class CidrAddressField(with_metaclass(models.SubfieldBase, _NetAddressField)):
     description = "PostgreSQL CIDR field"
     max_length = 43
-    __metaclass__ = models.SubfieldBase
 
     def db_type(self, connection):
         return 'cidr'
@@ -129,7 +128,7 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(MACAddressField, self).formfield(**defaults)
 
-if VERSION[:2] < (1, 7):
+if DJANGO_VERSION[:2] < (1, 7):
     try:
         from south.modelsinspector import add_introspection_rules
         add_introspection_rules([], [

Diff for: netfields/managers.py

@@ -1,6 +1,6 @@
 from netaddr import IPNetwork
 
-from django import VERSION
+from django import VERSION as DJANGO_VERSION
 from django.db import models, connection
 from django.db.backends.postgresql_psycopg2.base import DatabaseWrapper
 from django.db.models.fields import DateTimeField
@@ -10,6 +10,12 @@
 
 import datetime
 
+try:
+    basestring
+except NameError:
+    basestring = (str, bytes)
+
+
 NET_OPERATORS = DatabaseWrapper.operators.copy()
 
 for operator in ['contains', 'startswith', 'endswith']:
@@ -32,14 +38,11 @@ class NetQuery(sql.Query):
 
 
 class NetWhere(sql.where.WhereNode):
-
-
     def _prepare_data(self, data):
         """
         Special form of WhereNode._prepare_data() that does not automatically consume the
         __iter__ method of IPNetwork objects.  This is used in Django >= 1.6
         """
-
         if not isinstance(data, (list, tuple)):
             return data
         obj, lookup_type, value = data
@@ -65,7 +68,7 @@ def _prepare_data(self, data):
         return (obj, lookup_type, value_annotation, value)
 
 
-    if VERSION[:2] < (1, 6):
+    if DJANGO_VERSION[:2] < (1, 6):
         def add(self, data, connector):
             """
             Special form of WhereNode.add() that does not automatically consume the
@@ -100,7 +103,7 @@ def add(self, data, connector):
             tree.Node.add(self,
                 (obj, lookup_type, value_annotation, value), connector)
 
-    if VERSION[:2] < (1, 7):
+    if DJANGO_VERSION[:2] < (1, 7):
         def make_atom(self, child, qn, conn):
             lvalue, lookup_type, value_annot, params_or_value = child
 
@@ -163,7 +166,7 @@ def get_queryset(self):
         q = NetQuery(self.model, NetWhere)
         return query.QuerySet(self.model, q)
 
-    if VERSION[:2] < (1, 6):
+    if DJANGO_VERSION[:2] < (1, 6):
         def get_query_set(self):
             q = NetQuery(self.model, NetWhere)
             return query.QuerySet(self.model, q)