Django

Code

Changeset 1835

Show
Ignore:
Timestamp:
01/06/06 14:49:38 (3 years ago)
Author:
adrian
Message:

magic-removal: Merged to [1834]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/AUTHORS

    r1581 r1835  
    3232answer newbie questions, and generally made Django that much better: 
    3333 
     34    akaihola 
    3435    Andreas 
    3536    David Ascher <http://ascher.ca/> 

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

    r1792 r1835  
    2020        cls.objects._prepare() 
    2121 
    22 dispatcher.connect( 
    23     ensure_default_manager, 
    24     signal=signals.class_prepared 
    25 ) 
     22dispatcher.connect(ensure_default_manager, signal=signals.class_prepared) 
    2623 
    2724class Manager(object): 
    28         # Tracks each time a Manager instance is created. Used to retain order. 
     25    # Tracks each time a Manager instance is created. Used to retain order. 
    2926    creation_counter = 0 
    3027 
    …… 
    177174 
    178175    def get_in_bulk(self, *args, **kwargs): 
    179         id_list = args and args[0] or kwargs['id_list'] 
     176        id_list = args and args[0] or kwargs.get('id_list', []) 
    180177        assert id_list != [], "get_in_bulk() cannot be passed an empty list." 
    181178        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)))] 

  • django/branches/magic-removal/docs/faq.txt

    r1318 r1835  
    214214 
    215215However, if you don't want to use mod_python, you can use a different server, 
    216 as long as that server has WSGI_ hooks. More information on alternate server 
    217 arrangements is forthcoming. 
     216as long as that server has WSGI_ hooks. See the `server arrangements wiki page`_. 
    218217 
    219218.. _WSGI: http://www.python.org/peps/pep-0333.html 
     219.. _server arrangements wiki page: http://code.djangoproject.com/wiki/ServerArrangements 
    220220 
    221221How do I install mod_python on Windows? 
    …… 
    231231.. _`Running mod_python on Apache on Windows2000`: http://groups-beta.google.com/group/comp.lang.python/msg/139af8c83a5a9d4f 
    232232.. _`guide to getting mod_python working`: http://www.dscpl.com.au/articles/modpython-001.html 
    233  
    234 (Thanks to deelan for this info.) 
    235233 
    236234Will Django run under shared hosting (like TextDrive or Dreamhost)? 
    …… 
    307305----------------------------------------------------------- 
    308306 
    309 If you don't care about clearing data, just do this:: 
     307If you don't care about clearing data, just pipe the output of the 
     308appropriate ``django-admin.py sqlreset`` command into your database's 
     309command-line utility. For example:: 
    310310 
    311311    django-admin.py sqlreset appname | psql dbname 

  • django/branches/magic-removal/tests/modeltests/lookup/models.py

    r1754 r1835  
    6666>>> Article.objects.get_in_bulk([1000]) 
    6767{} 
     68>>> Article.objects.get_in_bulk([]) 
     69Traceback (most recent call last): 
     70    ... 
     71AssertionError: get_in_bulk() cannot be passed an empty list. 
    6872 
    6973# get_values() is just like get_list(), except it returns a list of