diff options
Diffstat (limited to 'django/views')
| -rw-r--r-- | django/views/generic/dates.py | 2 | ||||
| -rw-r--r-- | django/views/templates/technical_404.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/django/views/generic/dates.py b/django/views/generic/dates.py index 5e0247474d..2aedf3aacd 100644 --- a/django/views/generic/dates.py +++ b/django/views/generic/dates.py @@ -612,7 +612,7 @@ def _date_from_string(year, year_format, month='', month_format='', day='', day_ (only year is mandatory). Raise a 404 for an invalid date. """ format = year_format + delim + month_format + delim + day_format - datestr = year + delim + month + delim + day + datestr = str(year) + delim + str(month) + delim + str(day) try: return datetime.datetime.strptime(datestr, format).date() except ValueError: diff --git a/django/views/templates/technical_404.html b/django/views/templates/technical_404.html index ec518f658e..0bf5fd3cd0 100644 --- a/django/views/templates/technical_404.html +++ b/django/views/templates/technical_404.html @@ -52,7 +52,7 @@ {% for pattern in urlpatterns %} <li> {% for pat in pattern %} - {{ pat.regex.pattern }} + {{ pat.pattern }} {% if forloop.last and pat.name %}[name='{{ pat.name }}']{% endif %} {% endfor %} </li> |