Browse Source

pep8 fixes

Ewoud Kohl van Wijngaarden 12 years ago
parent
commit
e467a97098
5 changed files with 21 additions and 10 deletions
  1. 1 1
      netfields/__init__.py
  2. 1 1
      netfields/fields.py
  3. 4 1
      netfields/forms.py
  4. 10 6
      netfields/managers.py
  5. 5 1
      netfields/models.py

+ 1 - 1
netfields/__init__.py

@@ -1,3 +1,3 @@
 from netfields.managers import NetManager
 from netfields.fields import (InetAddressField, CidrAddressField,
-        MACAddressField)
+                              MACAddressField)

+ 1 - 1
netfields/fields.py

@@ -5,6 +5,7 @@ from django.db import models
 from netfields.managers import NET_OPERATORS, NET_TEXT_OPERATORS
 from netfields.forms import NetAddressFormField, MACAddressFormField
 
+
 class _NetAddressField(models.Field):
     empty_strings_allowed = False
 
@@ -29,7 +30,6 @@ class _NetAddressField(models.Field):
         return super(_NetAddressField, self).get_prep_lookup(
             lookup_type, value)
 
-
     def get_prep_value(self, value):
         if not value:
             return None

+ 4 - 1
netfields/forms.py

@@ -5,12 +5,14 @@ from django import forms
 from django.utils.encoding import force_unicode
 from django.utils.safestring import mark_safe
 
+
 class NetInput(forms.Widget):
     input_type = 'text'
 
     def render(self, name, value, attrs=None):
         # Default forms.Widget compares value != '' which breaks IP...
-        if value is None: value = ''
+        if value is None:
+            value = ''
         final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
         if value:
             final_attrs['value'] = force_unicode(value)
@@ -38,6 +40,7 @@ class NetAddressFormField(forms.Field):
 
 mac_re = re.compile(r'^(([A-F0-9]{2}:){5}[A-F0-9]{2})$')
 
+
 class MACAddressFormField(forms.RegexField):
     default_error_messages = {
         'invalid': u'Enter a valid MAC address.',

+ 10 - 6
netfields/managers.py

@@ -39,7 +39,8 @@ class NetWhere(sql.where.WhereNode):
 
         if hasattr(lvalue, 'process'):
             try:
-                lvalue, params = lvalue.process(lookup_type, params_or_value, connection)
+                lvalue, params = lvalue.process(lookup_type, params_or_value,
+                                                connection)
             except sql.where.EmptyShortCircuit:
                 raise query.EmptyResultSet
         else:
@@ -57,9 +58,9 @@ class NetWhere(sql.where.WhereNode):
 
         if NET_OPERATORS.get(lookup_type, '') in NET_TEXT_OPERATORS:
             if db_type == 'inet':
-                field_sql  = 'HOST(%s)' % field_sql
+                field_sql = 'HOST(%s)' % field_sql
             else:
-                field_sql  = 'TEXT(%s)' % field_sql
+                field_sql = 'TEXT(%s)' % field_sql
 
         if isinstance(params, QueryWrapper):
             extra, params = params.data
@@ -70,17 +71,20 @@ class NetWhere(sql.where.WhereNode):
             params = (params,)
 
         if lookup_type in NET_OPERATORS:
-            return (' '.join([field_sql, NET_OPERATORS[lookup_type], extra]), params)
+            return (' '.join([field_sql, NET_OPERATORS[lookup_type], extra]),
+                    params)
         elif lookup_type == 'in':
             if not value_annot:
                 raise sql.datastructures.EmptyResultSet
             if extra:
                 return ('%s IN %s' % (field_sql, extra), params)
-            return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] * len(params))), params)
+            return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] *
+                    len(params))), params)
         elif lookup_type == 'range':
             return ('%s BETWEEN %%s and %%s' % field_sql, params)
         elif lookup_type == 'isnull':
-            return ('%s IS %sNULL' % (field_sql, (not value_annot and 'NOT ' or '')), params)
+            return ('%s IS %sNULL' % (field_sql, (not value_annot and 'NOT ' or
+                    '')), params)
 
         raise ValueError('Invalid lookup type "%s"' % lookup_type)
 

+ 5 - 1
netfields/models.py

@@ -3,6 +3,7 @@ from django.db.models import Model
 from netfields import InetAddressField, CidrAddressField, MACAddressField, \
         NetManager
 
+
 class InetTestModel(Model):
     field = InetAddressField()
     objects = NetManager()
@@ -10,6 +11,7 @@ class InetTestModel(Model):
     class Meta:
         db_table = 'inet'
 
+
 class NullInetTestModel(Model):
     field = InetAddressField(null=True)
     objects = NetManager()
@@ -17,6 +19,7 @@ class NullInetTestModel(Model):
     class Meta:
         db_table = 'nullinet'
 
+
 class CidrTestModel(Model):
     field = CidrAddressField()
     objects = NetManager()
@@ -24,6 +27,7 @@ class CidrTestModel(Model):
     class Meta:
         db_table = 'cidr'
 
+
 class NullCidrTestModel(Model):
     field = CidrAddressField(null=True)
     objects = NetManager()
@@ -31,10 +35,10 @@ class NullCidrTestModel(Model):
     class Meta:
         db_table = 'nullcidr'
 
+
 class MACTestModel(Model):
     mac = MACAddressField(null=True)
     objects = NetManager()
 
     class Meta:
         db_table = 'mac'
-