diff options
| author | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-06-12 17:56:00 +0000 |
|---|---|---|
| committer | Boulder Sprinters <boulder-sprinters@djangoproject.com> | 2007-06-12 17:56:00 +0000 |
| commit | 1f09aa1e7b4079e22d1dfcde0f7d4e571389d8b5 (patch) | |
| tree | fe642c5f74b17e197198e5b376b2b44c7fe40daa | |
| parent | 0f36cbec13a2a6792036b16a7596ad024592309c (diff) | |
| download | django-1f09aa1e7b4079e22d1dfcde0f7d4e571389d8b5.tar.gz | |
boulder-oracle-sprint: Merged to [5466]
git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@5467 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/test/client.py | 7 | ||||
| -rw-r--r-- | docs/db-api.txt | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/django/test/client.py b/django/test/client.py index c3110f02ec..e4fd54c23b 100644 --- a/django/test/client.py +++ b/django/test/client.py @@ -65,10 +65,7 @@ def encode_multipart(boundary, data): if isinstance(value, file): lines.extend([ '--' + boundary, - 'Content-Disposition: form-data; name="%s"' % key, - '', - '--' + boundary, - 'Content-Disposition: form-data; name="%s_file"; filename="%s"' % (key, value.name), + 'Content-Disposition: form-data; name="%s"; filename="%s"' % (key, value.name), 'Content-Type: application/octet-stream', '', value.read() @@ -251,4 +248,4 @@ class Client: return True else: return False -
\ No newline at end of file + diff --git a/docs/db-api.txt b/docs/db-api.txt index 49e4ffa739..e7b8183f6c 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -598,7 +598,7 @@ related ``Person`` *and* the related ``City``:: p = b.author # Doesn't hit the database. c = p.hometown # Doesn't hit the database. - sv = Book.objects.get(id=4) # No select_related() in this example. + b = Book.objects.get(id=4) # No select_related() in this example. p = b.author # Hits the database. c = p.hometown # Hits the database. |