mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Use the class decorator syntax available in Python >= 2.6. Refs #17965.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Aymeric Augustin
2012-03-30 09:08:29 +00:00
parent 9383a2761c
commit eb163f37cb
20 changed files with 147 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/modeltests/proxy_model_inheritance/tests.py
View File

@@ -18,7 +18,7 @@ from django.test import TransactionTestCase
from django.test.utils import override_settings
# @override_settings(INSTALLED_APPS=('app1', 'app2'))
@override_settings(INSTALLED_APPS=('app1', 'app2'))
class ProxyModelInheritanceTests(TransactionTestCase):
def setUp(self):
@@ -41,5 +41,3 @@ class ProxyModelInheritanceTests(TransactionTestCase):
from .app2.models import NiceModel
self.assertEqual(NiceModel.objects.all().count(), 0)
self.assertEqual(ProxyModel.objects.all().count(), 0)
ProxyModelInheritanceTests = override_settings(INSTALLED_APPS=('app1', 'app2'))(ProxyModelInheritanceTests)

26
tests/modeltests/timezones/tests.py
View File

@@ -74,7 +74,7 @@ class BaseDateTimeTests(TestCase):
time.tzset()
#@override_settings(USE_TZ=False)
@override_settings(USE_TZ=False)
class LegacyDatabaseTests(BaseDateTimeTests):
def test_naive_datetime(self):
@@ -268,14 +268,11 @@ class LegacyDatabaseTests(BaseDateTimeTests):
[event],
transform=lambda d: d)
LegacyDatabaseTests = override_settings(USE_TZ=False)(LegacyDatabaseTests)
#@override_settings(USE_TZ=True)
@override_settings(USE_TZ=True)
class NewDatabaseTests(BaseDateTimeTests):
@requires_tz_support
@skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
def test_naive_datetime(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30)
with warnings.catch_warnings(record=True) as recorded:
@@ -289,7 +286,6 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
@requires_tz_support
@skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
def test_datetime_from_date(self):
dt = datetime.date(2011, 9, 1)
with warnings.catch_warnings(record=True) as recorded:
@@ -302,7 +298,6 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(event.dt, datetime.datetime(2011, 9, 1, tzinfo=EAT))
@requires_tz_support
@skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
@skipUnlessDBFeature('supports_microsecond_precision')
def test_naive_datetime_with_microsecond(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
@@ -317,7 +312,6 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(event.dt, dt.replace(tzinfo=EAT))
@requires_tz_support
@skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
@skipIfDBFeature('supports_microsecond_precision')
def test_naive_datetime_with_microsecond_unsupported(self):
dt = datetime.datetime(2011, 9, 1, 13, 20, 30, 405060)
@@ -400,7 +394,6 @@ class NewDatabaseTests(BaseDateTimeTests):
self.assertEqual(Event.objects.filter(dt__range=(prev, next)).count(), 1)
@requires_tz_support
@skipIf(sys.version_info < (2, 6), "this test requires Python >= 2.6")
def test_query_filter_with_naive_datetime(self):
dt = datetime.datetime(2011, 9, 1, 12, 20, 30, tzinfo=EAT)
Event.objects.create(dt=dt)
@@ -492,8 +485,6 @@ class NewDatabaseTests(BaseDateTimeTests):
e = MaybeEvent.objects.create()
self.assertEqual(e.dt, None)
NewDatabaseTests = override_settings(USE_TZ=True)(NewDatabaseTests)
class SerializationTests(BaseDateTimeTests):
@@ -648,7 +639,7 @@ class SerializationTests(BaseDateTimeTests):
obj = serializers.deserialize('yaml', data).next().object
self.assertEqual(obj.dt.replace(tzinfo=UTC), dt)
#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
class TemplateTests(BaseDateTimeTests):
@requires_tz_support
@@ -887,9 +878,8 @@ class TemplateTests(BaseDateTimeTests):
with timezone.override(ICT):
self.assertEqual(tpl.render(Context({})), "+0700")
TemplateTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(TemplateTests)
#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)
@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)
class LegacyFormsTests(BaseDateTimeTests):
def test_form(self):
@@ -923,9 +913,8 @@ class LegacyFormsTests(BaseDateTimeTests):
e = Event.objects.get()
self.assertEqual(e.dt, datetime.datetime(2011, 9, 1, 13, 20, 30))
LegacyFormsTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=False)(LegacyFormsTests)
#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
class NewFormsTests(BaseDateTimeTests):
@requires_tz_support
@@ -970,9 +959,8 @@ class NewFormsTests(BaseDateTimeTests):
e = Event.objects.get()
self.assertEqual(e.dt, datetime.datetime(2011, 9, 1, 10, 20, 30, tzinfo=UTC))
NewFormsTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(NewFormsTests)
#@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
@override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)
class AdminTests(BaseDateTimeTests):
urls = 'modeltests.timezones.urls'
@@ -1023,8 +1011,6 @@ class AdminTests(BaseDateTimeTests):
response = self.client.get(reverse('admin:timezones_timestamp_change', args=(t.pk,)))
self.assertContains(response, t.created.astimezone(ICT).isoformat())
AdminTests = override_settings(DATETIME_FORMAT='c', USE_L10N=False, USE_TZ=True)(AdminTests)
class UtilitiesTests(BaseDateTimeTests):