Django

Code

Changeset 2017

Show
Ignore:
Timestamp:
01/16/06 17:11:12 (3 years ago)
Author:
adrian
Message:

magic-removal: Negligible formatting cleanups in django/db/models

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/db/models/__init__.py

    r1956 r2017  
    11from django.conf import settings 
     2from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured 
    23from django.core import validators 
    3  
    44from django.db import backend, connection 
    5  
    6 from django.utils.functional import curry 
    7 from django.utils.text import capfirst 
    8  
    95from django.db.models.loading import get_installed_models, get_installed_model_modules 
    106from django.db.models.query import Q 
    117from django.db.models.manager import Manager 
    128from django.db.models.base import Model, AdminOptions 
    13  
    149from django.db.models.fields import * 
    1510from django.db.models.fields.related import * 
    16  
    17 from django.core.exceptions import ObjectDoesNotExist, ImproperlyConfigured 
    1811from django.db.models.exceptions import FieldDoesNotExist, BadKeywordArguments 
    1912from django.db.models import signals 
     13from django.utils.functional import curry 
     14from django.utils.text import capfirst 
    2015 
    2116# Admin stages. 
    2217ADD, CHANGE, BOTH = 1, 2, 3 
    23  
    24 #def get_module(app_label, module_name): 
    25 #    return __import__('%s.%s.%s' % (MODEL_PREFIX, app_label, module_name), '', '', ['']) 
    2618 
    2719def get_models(app): 

  • django/branches/magic-removal/django/db/models/loading.py

    r1693 r2017  
    2424        modules.append(mod) 
    2525    for name in getattr(mod, '__all__', []): 
    26         submod = __import__("%s.%s" % ( mod.__name__, name),'','',['']) 
     26        submod = __import__("%s.%s" % (mod.__name__, name), '', '', ['']) 
    2727        add_model_module(submod, modules) 
    2828 

  • django/branches/magic-removal/django/db/models/manager.py

    r1885 r2017  
    192192    def get_in_bulk(self, id_list, *args, **kwargs): 
    193193        assert isinstance(id_list, list), "get_in_bulk() must be provided with a list of IDs." 
    194         assert id_list != [], "get_in_bulk() cannot be passed an empty ID list."         
     194        assert id_list != [], "get_in_bulk() cannot be passed an empty ID list." 
    195195        kwargs['where'] = ["%s.%s IN (%s)" % (backend.quote_name(self.klass._meta.db_table), backend.quote_name(self.klass._meta.pk.column), ",".join(['%s'] * len(id_list)))] 
    196196        kwargs['params'] = id_list 

  • django/branches/magic-removal/django/db/models/options.py

    r1887 r2017  
    1616DEFAULT_NAMES = ('module_name', 'verbose_name', 'verbose_name_plural', 'db_table', 'ordering', 
    1717                  'unique_together', 'admin','where_constraints', 'exceptions', 'permissions', 
    18                   'get_latest_by','order_with_respect_to', 'module_constants') 
     18                  'get_latest_by', 'order_with_respect_to', 'module_constants') 
    1919 
    2020class Options: 
    …… 
    3434        self.module_constants = {} 
    3535        self.admin = None 
    36  
    3736        self.meta = meta 
    3837        self.pk = None 
    …… 
    9291    def __repr__(self): 
    9392        return '<Options for %s>' % self.module_name 
    94  
    95    # def get_model_module(self): 
    96    #     return get_module(self.app_label, self.module_name) 
    9793 
    9894    def get_content_type_id(self): 

  • django/branches/magic-removal/django/db/models/query.py

    r1884 r2017  
    282282            intermediate_table = field.get_m2m_db_table(current_opts) 
    283283 
    284             raise FieldFound() 
     284            raise FieldFound 
    285285 
    286286        # Does the name belong to a reverse defined many-to-many field? 
    …… 
    298298            intermediate_table = field.field.get_m2m_db_table(new_opts) 
    299299 
    300             raise FieldFound() 
     300            raise FieldFound 
    301301 
    302302        # Does the name belong to a one-to-many field? 
    …… 
    311311            join_required = True 
    312312 
    313             raise FieldFound() 
     313            raise FieldFound 
    314314 
    315315        # Does the name belong to a one-to-one, many-to-one, or regular field? 
    …… 
    322322                join_column = field.column 
    323323 
    324             raise FieldFound() 
     324            raise FieldFound 
    325325 
    326326    except FieldFound: # Match found, loop has been shortcut. 

  • django/branches/magic-removal/django/db/models/related.py

    r1827 r2017  
    22 
    33class RelatedManipulatorCollection(ManipulatorCollection): 
    4     def __init__(self,related, parent_name_parts , instance, follow): 
    5         name_parts = parent_name_parts + (related.var_name, ) 
     4    def __init__(self, related, parent_name_parts, instance, follow): 
     5        name_parts = parent_name_parts + (related.var_name,) 
    66        self.instance = instance 
    77        self.related = related 
    8         super(RelatedManipulatorCollection, self).__init__( 
    9             related.model,follow,name_parts) 
     8        super(RelatedManipulatorCollection, self).__init__(related.model, follow, name_parts) 
    109 
    1110    def _save_child(self, manip, parent_key):