Django

Code

Show
Ignore:
Timestamp:
07/18/08 18:01:28 (4 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7956].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7953 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7959

  • django/branches/newforms-admin/django/db/backends/sqlite3/base.py

    r7937 r7960  
    111111    def _cursor(self, settings): 
    112112        if self.connection is None: 
     113            if not settings.DATABASE_NAME: 
     114                from django.core.exceptions import ImproperlyConfigured 
     115                raise ImproperlyConfigured, "Please fill out DATABASE_NAME in the settings module before using the database." 
    113116            kwargs = { 
    114117                'database': settings.DATABASE_NAME, 

  • django/branches/newforms-admin/django/db/models/base.py

    r7936 r7960  
    485485            import warnings 
    486486            warnings.warn( 
    487                 message = "Representing uploaded files as dictionaries is"\ 
    488                           " deprecated. Use django.core.files.SimpleUploadedFile"\ 
    489                           " instead.", 
     487                message = "Representing uploaded files as dictionaries is deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.", 
    490488                category = DeprecationWarning, 
    491489                stacklevel = 2 
    …… 
    497495            import warnings 
    498496            warnings.warn( 
    499                 message = "Representing uploaded files as strings is "\ 
    500                           " deprecated. Use django.core.files.SimpleUploadedFile "\ 
    501                           " instead.", 
     497                message = "Representing uploaded files as dictionaries is deprecated. Use django.core.files.uploadedfile.SimpleUploadedFile instead.", 
    502498                category = DeprecationWarning, 
    503499                stacklevel = 2