summaryrefslogtreecommitdiff
path: root/django/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'django/contrib')
-rw-r--r--django/contrib/admin/views/decorators.py12
-rw-r--r--django/contrib/auth/decorators.py7
-rw-r--r--django/contrib/databrowse/plugins/calendars.py2
-rw-r--r--django/contrib/databrowse/plugins/fieldchoices.py2
-rw-r--r--django/contrib/databrowse/views.py2
-rw-r--r--django/contrib/formtools/preview.py1
-rw-r--r--django/contrib/formtools/tests.py5
-rw-r--r--django/contrib/humanize/templatetags/humanize.py3
-rw-r--r--django/contrib/localflavor/ar/forms.py1
-rw-r--r--django/contrib/localflavor/generic/forms.py76
-rw-r--r--django/contrib/localflavor/jp/forms.py2
-rw-r--r--django/contrib/sessions/models.py5
-rw-r--r--django/contrib/webdesign/tests.py1
13 files changed, 54 insertions, 65 deletions
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index 4f6662c970..b9fd9ab900 100644
--- a/django/contrib/admin/views/decorators.py
+++ b/django/contrib/admin/views/decorators.py
@@ -1,3 +1,11 @@
+import base64
+import md5
+import cPickle as pickle
+try:
+ from functools import wraps
+except ImportError:
+ from django.utils.functional import wraps # Python 2.3, 2.4 fallback.
+
from django import http, template
from django.conf import settings
from django.contrib.auth.models import User
@@ -5,8 +13,6 @@ from django.contrib.auth import authenticate, login
from django.shortcuts import render_to_response
from django.utils.translation import ugettext_lazy, ugettext as _
from django.utils.safestring import mark_safe
-import base64, datetime, md5
-import cPickle as pickle
ERROR_MESSAGE = ugettext_lazy("Please enter a correct username and password. Note that both fields are case-sensitive.")
LOGIN_FORM_KEY = 'this_is_the_login_form'
@@ -104,4 +110,4 @@ def staff_member_required(view_func):
else:
return _display_login_form(request, ERROR_MESSAGE)
- return _checklogin
+ return wraps(view_func)(_checklogin)
diff --git a/django/contrib/auth/decorators.py b/django/contrib/auth/decorators.py
index f3f7f530ef..25bc20780e 100644
--- a/django/contrib/auth/decorators.py
+++ b/django/contrib/auth/decorators.py
@@ -1,3 +1,8 @@
+try:
+ from functools import wraps, update_wrapper
+except ImportError:
+ from django.utils.functional import wraps, update_wrapper # Python 2.3, 2.4 fallback.
+
from django.contrib.auth import REDIRECT_FIELD_NAME
from django.http import HttpResponseRedirect
from django.utils.http import urlquote
@@ -51,7 +56,7 @@ class _CheckLogin(object):
self.test_func = test_func
self.login_url = login_url
self.redirect_field_name = redirect_field_name
- self.__name__ = view_func.__name__
+ update_wrapper(self, view_func)
def __get__(self, obj, cls=None):
view_func = self.view_func.__get__(obj, cls)
diff --git a/django/contrib/databrowse/plugins/calendars.py b/django/contrib/databrowse/plugins/calendars.py
index 5d5a020e6d..a798868b55 100644
--- a/django/contrib/databrowse/plugins/calendars.py
+++ b/django/contrib/databrowse/plugins/calendars.py
@@ -8,8 +8,6 @@ from django.utils.translation import get_date_formats
from django.utils.encoding import force_unicode
from django.utils.safestring import mark_safe
from django.views.generic import date_based
-import datetime
-import time
class CalendarPlugin(DatabrowsePlugin):
def __init__(self, field_names=None):
diff --git a/django/contrib/databrowse/plugins/fieldchoices.py b/django/contrib/databrowse/plugins/fieldchoices.py
index dea6bac700..0a58e7a6ab 100644
--- a/django/contrib/databrowse/plugins/fieldchoices.py
+++ b/django/contrib/databrowse/plugins/fieldchoices.py
@@ -7,8 +7,6 @@ from django.utils.text import capfirst
from django.utils.encoding import smart_str, force_unicode
from django.utils.safestring import mark_safe
from django.views.generic import date_based
-import datetime
-import time
import urllib
class FieldChoicePlugin(DatabrowsePlugin):
diff --git a/django/contrib/databrowse/views.py b/django/contrib/databrowse/views.py
index d493f9dad3..c17aad5d85 100644
--- a/django/contrib/databrowse/views.py
+++ b/django/contrib/databrowse/views.py
@@ -2,8 +2,6 @@ from django.db.models import FieldDoesNotExist, DateTimeField
from django.http import Http404
from django.shortcuts import render_to_response
from django.contrib.databrowse.datastructures import EasyModel, EasyChoice
-import datetime
-import time
###########
# CHOICES #
diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py
index bd0ce5cbb7..66583dde95 100644
--- a/django/contrib/formtools/preview.py
+++ b/django/contrib/formtools/preview.py
@@ -3,7 +3,6 @@ Formtools Preview application.
"""
from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
from django.http import Http404
from django.shortcuts import render_to_response
from django.template.context import RequestContext
diff --git a/django/contrib/formtools/tests.py b/django/contrib/formtools/tests.py
index a5a9222c46..feda6e041e 100644
--- a/django/contrib/formtools/tests.py
+++ b/django/contrib/formtools/tests.py
@@ -3,8 +3,6 @@ from django.contrib.formtools import preview
from django import http
from django.conf import settings
from django.test import TestCase
-from django.test.client import Client
-
success_string = "Done was called!"
test_data = {'field1': u'foo',
@@ -88,6 +86,3 @@ class PreviewTests(TestCase):
response = self.client.post('/test1/', test_data)
self.assertEqual(response.content, success_string)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py
index 4aa5a32e3f..05d322363b 100644
--- a/django/contrib/humanize/templatetags/humanize.py
+++ b/django/contrib/humanize/templatetags/humanize.py
@@ -2,8 +2,7 @@ from django.utils.translation import ungettext, ugettext as _
from django.utils.encoding import force_unicode
from django import template
from django.template import defaultfilters
-from django.conf import settings
-from datetime import date, timedelta
+from datetime import date
import re
register = template.Library()
diff --git a/django/contrib/localflavor/ar/forms.py b/django/contrib/localflavor/ar/forms.py
index 7827698e77..b23923b47a 100644
--- a/django/contrib/localflavor/ar/forms.py
+++ b/django/contrib/localflavor/ar/forms.py
@@ -7,7 +7,6 @@ from django.newforms import ValidationError
from django.newforms.fields import RegexField, CharField, Select, EMPTY_VALUES
from django.utils.encoding import smart_unicode
from django.utils.translation import ugettext
-import re
class ARProvinceSelect(Select):
"""
diff --git a/django/contrib/localflavor/generic/forms.py b/django/contrib/localflavor/generic/forms.py
index a6d813723c..a5e431e4b3 100644
--- a/django/contrib/localflavor/generic/forms.py
+++ b/django/contrib/localflavor/generic/forms.py
@@ -1,38 +1,38 @@
-from django import newforms as forms
-
-DEFAULT_DATE_INPUT_FORMATS = (
- '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
- '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
- '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
- '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
- '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
-)
-
-DEFAULT_DATETIME_INPUT_FORMATS = (
- '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
- '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
- '%Y-%m-%d', # '2006-10-25'
- '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
- '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
- '%d/%m/%Y', # '25/10/2006'
- '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
- '%d/%m/%y %H:%M', # '25/10/06 14:30'
- '%d/%m/%y', # '25/10/06'
-)
-
-class DateField(forms.DateField):
- """
- A date input field which uses non-US date input formats by default.
- """
- def __init__(self, input_formats=None, *args, **kwargs):
- input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS
- super(DateField, self).__init__(input_formats=input_formats, *args, **kwargs)
-
-class DateTimeField(forms.DateTimeField):
- """
- A date and time input field which uses non-US date and time input formats
- by default.
- """
- def __init__(self, input_formats=None, *args, **kwargs):
- input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS
- super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs)
+from django import newforms as forms
+
+DEFAULT_DATE_INPUT_FORMATS = (
+ '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06'
+ '%b %d %Y', '%b %d, %Y', # 'Oct 25 2006', 'Oct 25, 2006'
+ '%d %b %Y', '%d %b, %Y', # '25 Oct 2006', '25 Oct, 2006'
+ '%B %d %Y', '%B %d, %Y', # 'October 25 2006', 'October 25, 2006'
+ '%d %B %Y', '%d %B, %Y', # '25 October 2006', '25 October, 2006'
+)
+
+DEFAULT_DATETIME_INPUT_FORMATS = (
+ '%Y-%m-%d %H:%M:%S', # '2006-10-25 14:30:59'
+ '%Y-%m-%d %H:%M', # '2006-10-25 14:30'
+ '%Y-%m-%d', # '2006-10-25'
+ '%d/%m/%Y %H:%M:%S', # '25/10/2006 14:30:59'
+ '%d/%m/%Y %H:%M', # '25/10/2006 14:30'
+ '%d/%m/%Y', # '25/10/2006'
+ '%d/%m/%y %H:%M:%S', # '25/10/06 14:30:59'
+ '%d/%m/%y %H:%M', # '25/10/06 14:30'
+ '%d/%m/%y', # '25/10/06'
+)
+
+class DateField(forms.DateField):
+ """
+ A date input field which uses non-US date input formats by default.
+ """
+ def __init__(self, input_formats=None, *args, **kwargs):
+ input_formats = input_formats or DEFAULT_DATE_INPUT_FORMATS
+ super(DateField, self).__init__(input_formats=input_formats, *args, **kwargs)
+
+class DateTimeField(forms.DateTimeField):
+ """
+ A date and time input field which uses non-US date and time input formats
+ by default.
+ """
+ def __init__(self, input_formats=None, *args, **kwargs):
+ input_formats = input_formats or DEFAULT_DATETIME_INPUT_FORMATS
+ super(DateTimeField, self).__init__(input_formats=input_formats, *args, **kwargs)
diff --git a/django/contrib/localflavor/jp/forms.py b/django/contrib/localflavor/jp/forms.py
index 13083aab6e..d726f822d7 100644
--- a/django/contrib/localflavor/jp/forms.py
+++ b/django/contrib/localflavor/jp/forms.py
@@ -7,8 +7,6 @@ from django.newforms import ValidationError
from django.utils.translation import ugettext
from django.newforms.fields import RegexField, Select
-import re
-
class JPPostalCodeField(RegexField):
"""
A form field that validates its input is a Japanese postcode.
diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py
index dfa7bed226..4769e63b1b 100644
--- a/django/contrib/sessions/models.py
+++ b/django/contrib/sessions/models.py
@@ -1,10 +1,5 @@
-import os
-import sys
-import time
-import datetime
import base64
import md5
-import random
import cPickle as pickle
from django.db import models
diff --git a/django/contrib/webdesign/tests.py b/django/contrib/webdesign/tests.py
index da9237a43b..d155620902 100644
--- a/django/contrib/webdesign/tests.py
+++ b/django/contrib/webdesign/tests.py
@@ -14,7 +14,6 @@ u'lorem ipsum dolor'
"""
from django.contrib.webdesign.lorem_ipsum import *
-import datetime
if __name__ == '__main__':
import doctest
generated by cgit v1.3 (git 2.53.0) at 2026-07-12 23:03:37 +0000