Merge pull request jimfunk#31 from jmacul2/master

my fixes for 1.7

Author: jimfunk

netfields/__init__.py

@@ -1,3 +1,5 @@
 from netfields.managers import NetManager
 from netfields.fields import (InetAddressField, CidrAddressField,
                               MACAddressField)
+
+default_app_config = 'netfields.apps.NetfieldsConfig'

netfields/apps.py

@@ -0,0 +1,19 @@
+from django.apps import AppConfig
+
+from netfields.fields import CidrAddressField, InetAddressField
+from netfields.lookups import NetContained, NetContains, NetContainedOrEqual, NetContainsOrEquals
+
+
+class NetfieldsConfig(AppConfig):
+    name = 'netfields'
+
+    CidrAddressField.register_lookup(NetContained)
+    CidrAddressField.register_lookup(NetContains)
+    CidrAddressField.register_lookup(NetContainedOrEqual)
+    CidrAddressField.register_lookup(NetContainsOrEquals)
+
+    InetAddressField.register_lookup(NetContained)
+    InetAddressField.register_lookup(NetContains)
+    InetAddressField.register_lookup(NetContainedOrEqual)
+    InetAddressField.register_lookup(NetContainsOrEquals)
+

netfields/lookups.py

@@ -0,0 +1,41 @@
+from django.db.models import Lookup
+from django.db.models.lookups import IExact, IContains
+
+class NetContains(Lookup):
+    lookup_name = 'net_contains'
+
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
+        params = lhs_params + rhs_params
+        return '%s >> %s' % (lhs, rhs), params
+
+
+class NetContained(Lookup):
+    lookup_name = 'net_contained'
+
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
+        params = lhs_params + rhs_params
+        return '%s << %s' % (lhs, rhs), params
+
+
+class NetContainsOrEquals(Lookup):
+    lookup_name = 'net_contains_or_equals'
+
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
+        params = lhs_params + rhs_params
+        return '%s >>= %s' % (lhs, rhs), params
+
+class NetContainedOrEqual(Lookup):
+    lookup_name = 'net_contained_or_equal'
+
+    def as_sql(self, qn, connection):
+        lhs, lhs_params = self.process_lhs(qn, connection)
+        rhs, rhs_params = self.process_rhs(qn, connection)
+        params = lhs_params + rhs_params
+        return '%s <<= %s' % (lhs, rhs), params
+

netfields/tests.py

@@ -13,7 +13,7 @@
 
 
 class BaseSqlTestCase(object):
-    select = 'SELECT "table"."id", "table"."field" FROM "table" '
+    select = u'SELECT "table"."id", "table"."field" FROM "table" '
 
     def assertSqlEquals(self, qs, sql):
         sql = sql.replace('"table"', '"%s"' % self.table)