Author: russellm
Date: 2008-11-16 02:20:25 -0600 (Sun, 16 Nov 2008)
New Revision: 9465
Modified:
django/trunk/django/test/client.py
Log:
Fixed #9585 -- Corrected code committed in [9398] that wasn't compatible with
Python 2.3/2.4. Thanks to Karen Tracey for the report and fix.
Modified: django/trunk/django/test/client.py
===================================================================
--- django/trunk/django/test/client.py 2008-11-16 00:09:39 UTC (rev 9464)
+++ django/trunk/django/test/client.py 2008-11-16 08:20:25 UTC (rev 9465)
@@ -264,8 +264,8 @@
parsed = urlparse(path)
r = {
'CONTENT_TYPE': 'text/html; charset=utf-8',
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
'REQUEST_METHOD': 'GET',
'wsgi.input': FakePayload('')
}
@@ -286,8 +286,8 @@
r = {
'CONTENT_LENGTH': len(post_data),
'CONTENT_TYPE': content_type,
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': parsed[4],
'REQUEST_METHOD': 'POST',
'wsgi.input': FakePayload(post_data),
}
@@ -302,8 +302,8 @@
parsed = urlparse(path)
r = {
'CONTENT_TYPE': 'text/html; charset=utf-8',
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
'REQUEST_METHOD': 'HEAD',
'wsgi.input': FakePayload('')
}
@@ -317,8 +317,8 @@
"""
parsed = urlparse(path)
r = {
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
'REQUEST_METHOD': 'OPTIONS',
'wsgi.input': FakePayload('')
}
@@ -339,8 +339,8 @@
r = {
'CONTENT_LENGTH': len(post_data),
'CONTENT_TYPE': content_type,
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
'REQUEST_METHOD': 'PUT',
'wsgi.input': FakePayload(post_data),
}
@@ -354,8 +354,8 @@
"""
parsed = urlparse(path)
r = {
- 'PATH_INFO': urllib.unquote(parsed.path),
- 'QUERY_STRING': urlencode(data, doseq=True) or parsed.query,
+ 'PATH_INFO': urllib.unquote(parsed[2]),
+ 'QUERY_STRING': urlencode(data, doseq=True) or parsed[4],
'REQUEST_METHOD': 'DELETE',
'wsgi.input': FakePayload('')
}
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
