Changeset 8490

Timestamp:

08/23/08 12:28:12 (3 months ago)

Author:

mtredinnick

Message:

Fixed #7494 -- Fixed build_absolute_url() for some types of (uncommon) URLs.
Patch from tom@almostobsolete.net and RobotAdam?.

Files:

• django/trunk/django/http/__init__.py (modified) (3 diffs)
• django/trunk/tests/regressiontests/requests/tests.py (modified) (1 diff)

django/trunk/django/http/__init__.py

@@ -1 +1 @@
-import os
+import re
-from Cookie import SimpleCookie, CookieError
-from pprint import pformat
@@ -18 +19 @@
-
-RESERVED_CHARS="!*'();:@&=+$,/?%#[]"
+
+absolute_http_url_re = re.compile(r"^https?://", re.I)
-
-class Http404(Exception):
@@ -66 +69 @@
-        if not location:
-            location = self.get_full_path()
-':' in location
+absolute_http_url_re.match(location)
-            current_uri = '%s://%s%s' % (self.is_secure() and 'https' or 'http',
-                                         self.get_host(), self.path)

django/trunk/tests/regressiontests/requests/tests.py

@@ -37 +37 @@
->>> parse_cookie('invalid:key=true')
-{}
+
+>>> request = HttpRequest()
+>>> print request.build_absolute_uri(location="https://www.example.com/asdf")
+https://www.example.com/asdf
+>>> request.get_host = lambda: 'www.example.com'
+>>> request.path = ''
+>>> print request.build_absolute_uri(location="/path/with:colons")
+http://www.example.com/path/with:colons
-"""