Django

Code

Show
Ignore:
Timestamp:
07/14/08 00:04:57 (6 months ago)
Author:
brosner
Message:

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

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-7880 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-7921

  • django/branches/newforms-admin/django/core/files/uploadedfile.py

    r7881 r7922  
    194194        Returns the full path of this file. 
    195195        """ 
    196         return self.name 
     196        return self._file.name 
    197197     
    198198    # Most methods on this object get proxied to NamedTemporaryFile.