Django

Code

Changeset 4138

Show
Ignore:
Timestamp:
11/29/06 13:51:54 (2 years ago)
Author:
jpellerin
Message:

[multi-db] Merge trunk to [3764]. Some tests still failing.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/multiple-db-support/django/core/servers/fastcgi.py

    r3174 r4138  
    7575    return False 
    7676 
    77 def runfastcgi(argset): 
     77def runfastcgi(argset, **kwargs): 
    7878    options = FASTCGI_OPTIONS.copy() 
     79    options.update(kwargs) 
    7980    for x in argset: 
    8081        if "=" in x: 

  • django/branches/multiple-db-support/docs/django-admin.txt

    r3712 r4138  
    296296---- 
    297297 
     298**New in Django development version** 
     299 
    298300Discover and run tests for all installed models.  See `Testing Django applications`_ for more information. 
    299301 
    …… 
    349351--------- 
    350352 
     353**New in Django development version** 
     354 
    351355Inform django-admin that the user should NOT be prompted for any input. Useful if 
    352356the django-admin script will be executed as an unattended, automated script. 
    …… 
    369373--verbosity 
    370374----------- 
     375 
     376**New in Django development version** 
    371377 
    372378Example usage:: 

  • django/branches/multiple-db-support/docs/fastcgi.txt

    r3227 r4138  
    271271    RewriteEngine On 
    272272    RewriteCond %{REQUEST_FILENAME} !-f 
    273     RewriteRule ^/(.*)$ /mysite.fcgi/$1 [QSA,L] 
     273    RewriteRule ^(.*)$ mysite.fcgi/$1 [QSA,L] 
    274274 
    275275Then, create a small script that tells Apache how to spawn your FastCGI 
    …… 
    290290 
    291291    from django.core.servers.fastcgi import runfastcgi 
    292     runfastcgi(["method=threaded", "daemonize=false"]) 
     292    runfastcgi(method="threaded", daemonize="false") 
    293293 
    294294Restarting the spawned server 

  • django/branches/multiple-db-support/docs/forms.txt

    r3502 r4138  
    322322            errors = {} 
    323323            # This makes sure the form accurate represents the fields of the place. 
    324             new_data = place.__dict__ 
     324            new_data = manipulator.flatten_data() 
    325325 
    326326        form = forms.FormWrapper(manipulator, new_data, errors) 
    …… 
    337337      object being edited. 
    338338 
    339     * We set ``new_data`` to the original object's ``__dict__``. This makes 
    340       sure the form fields contain the current values of the object. 
    341       ``FormWrapper`` does not modify ``new_data`` in any way, and templates 
    342       cannot, so this is perfectly safe. 
     339    * We set ``new_data`` based upon ``flatten_data()`` from the manipulator. 
     340      ``flatten_data()`` takes the data from the original object under  
     341      manipulation, and converts it into a data dictionary that can be used  
     342      to populate form elements with the existing values for the object. 
    343343 
    344344    * The above example uses a different template, so create and edit can be