diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py index b9fd9ab900..cedb1f9cfd 100644 --- a/django/contrib/admin/views/decorators.py +++ b/django/contrib/admin/views/decorators.py @@ -29,7 +29,7 @@ def _display_login_form(request, error_message=''): post_data = _encode_post_data({}) return render_to_response('admin/login.html', { 'title': _('Log in'), - 'app_path': mark_safe(request.path), + 'app_path': request.path, 'post_data': post_data, 'error_message': error_message }, context_instance=template.RequestContext(request)) diff --git a/django/db/backends/oracle/query.py b/django/db/backends/oracle/query.py index 033ffe8533..7e50c7b5db 100644 --- a/django/db/backends/oracle/query.py +++ b/django/db/backends/oracle/query.py @@ -1,6 +1,6 @@ """ -Custom Query class for this backend (a derivative of -django.db.models.sql.query.Query). +Custom Query class for Oracle. +Derives from: django.db.models.sql.query.Query """ import datetime @@ -12,8 +12,8 @@ _classes = {} def query_class(QueryClass, Database): """ - Returns a custom djang.db.models.sql.query.Query subclass that is - appropraite for Oracle. + Returns a custom django.db.models.sql.query.Query subclass that is + appropriate for Oracle. The 'Database' module (cx_Oracle) is passed in here so that all the setup required to import it only needs to be done by the calling module.