Django

Code

Show
Ignore:
Timestamp:
07/13/08 09:31:09 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7835 to /django/trunk:1-7917

  • django/branches/gis/django/oldforms/__init__.py

    r7836 r7918  
    687687                raise validators.CriticalValidationError, upload_errors 
    688688        try: 
    689             file_size = new_data.file_size 
     689            file_size = new_data.size 
    690690        except AttributeError: 
    691691            file_size = len(new_data['content'])