summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2014-05-15 19:41:55 +0200
committerClaude Paroz <claude@2xlibre.net>2014-05-15 20:01:31 +0200
commite8a7436941f56d27b0096c93ef4ea1da13a5b95f (patch)
tree662d34783acc05a7f18e80bb44873696b7741128 /tests
parentc5185172a6645714a1b9df53728c530e2d0d2f2e (diff)
[1.7.x] Harmonized some PEP 0263 coding preambles
Backport of e520a73ee from master.
Diffstat (limited to 'tests')
-rw-r--r--tests/admin_ordering/models.py2
-rw-r--r--tests/admin_views/tests.py2
-rw-r--r--tests/admin_widgets/tests.py2
-rw-r--r--tests/aggregation/models.py2
-rw-r--r--tests/aggregation_regress/models.py2
-rw-r--r--tests/basic/models.py2
-rw-r--r--tests/handlers/tests.py2
-rw-r--r--tests/i18n/contenttypes/tests.py2
-rw-r--r--tests/inline_formsets/models.py2
-rw-r--r--tests/mail/tests.py2
-rw-r--r--tests/migrations/test_autodetector.py2
-rw-r--r--tests/migrations/test_commands.py2
-rw-r--r--tests/migrations/test_migrations/0001_initial.py2
-rw-r--r--tests/migrations/test_migrations/0002_second.py2
-rw-r--r--tests/migrations/test_migrations_2/0001_initial.py2
-rw-r--r--tests/migrations/test_migrations_conflict/0001_initial.py2
-rw-r--r--tests/migrations/test_migrations_conflict/0002_conflicting_second.py2
-rw-r--r--tests/migrations/test_migrations_conflict/0002_second.py2
-rw-r--r--tests/migrations/test_migrations_custom_user/0001_initial.py2
-rw-r--r--tests/migrations/test_migrations_squashed/0001_initial.py2
-rw-r--r--tests/migrations/test_migrations_squashed/0001_squashed_0002.py2
-rw-r--r--tests/migrations/test_migrations_squashed/0002_second.py2
-rw-r--r--tests/migrations/test_migrations_unmigdep/0001_initial.py2
-rw-r--r--tests/migrations/test_optimizer.py2
-rw-r--r--tests/migrations/test_writer.py2
-rw-r--r--tests/model_regress/models.py2
-rw-r--r--tests/modeladmin/models.py2
-rw-r--r--tests/template_tests/filters.py2
-rw-r--r--tests/template_tests/test_context.py2
-rw-r--r--tests/template_tests/urls.py2
-rw-r--r--tests/test_client/tests.py2
-rw-r--r--tests/text/tests.py2
-rw-r--r--tests/utils_tests/test_jslex.py2
-rw-r--r--tests/view_tests/tests/test_json.py2
-rw-r--r--tests/view_tests/tests/test_specials.py2
-rw-r--r--tests/view_tests/urls.py2
36 files changed, 36 insertions, 36 deletions
diff --git a/tests/admin_ordering/models.py b/tests/admin_ordering/models.py
index fb99d2dac5..91831edc2b 100644
--- a/tests/admin_ordering/models.py
+++ b/tests/admin_ordering/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.contrib import admin
from django.db import models
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 2c7d02a541..fbea1d49c7 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import os
diff --git a/tests/admin_widgets/tests.py b/tests/admin_widgets/tests.py
index 3c6846073f..56374d7534 100644
--- a/tests/admin_widgets/tests.py
+++ b/tests/admin_widgets/tests.py
@@ -1,4 +1,4 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from datetime import datetime, timedelta
diff --git a/tests/aggregation/models.py b/tests/aggregation/models.py
index 691737c17e..0ca20def3e 100644
--- a/tests/aggregation/models.py
+++ b/tests/aggregation/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/aggregation_regress/models.py b/tests/aggregation_regress/models.py
index 4d495b4a75..e8714668ba 100644
--- a/tests/aggregation_regress/models.py
+++ b/tests/aggregation_regress/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.contrib.contenttypes.fields import (
GenericForeignKey, GenericRelation
)
diff --git a/tests/basic/models.py b/tests/basic/models.py
index 5e67b0dca9..d9fa08a056 100644
--- a/tests/basic/models.py
+++ b/tests/basic/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
"""
1. Bare-bones model
diff --git a/tests/handlers/tests.py b/tests/handlers/tests.py
index ae8b9529f5..8789f392b4 100644
--- a/tests/handlers/tests.py
+++ b/tests/handlers/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
diff --git a/tests/i18n/contenttypes/tests.py b/tests/i18n/contenttypes/tests.py
index 3e25867616..70314b737b 100644
--- a/tests/i18n/contenttypes/tests.py
+++ b/tests/i18n/contenttypes/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import os
diff --git a/tests/inline_formsets/models.py b/tests/inline_formsets/models.py
index 383122dbd7..f29362e321 100644
--- a/tests/inline_formsets/models.py
+++ b/tests/inline_formsets/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/mail/tests.py b/tests/mail/tests.py
index 06292b3cb6..0ea819ffbd 100644
--- a/tests/mail/tests.py
+++ b/tests/mail/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import asyncore
diff --git a/tests/migrations/test_autodetector.py b/tests/migrations/test_autodetector.py
index 510fd27b0b..54361f00ed 100644
--- a/tests/migrations/test_autodetector.py
+++ b/tests/migrations/test_autodetector.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from django.test import TestCase, override_settings
from django.db.migrations.autodetector import MigrationAutodetector
from django.db.migrations.questioner import MigrationQuestioner
diff --git a/tests/migrations/test_commands.py b/tests/migrations/test_commands.py
index 74881f8510..129e80b92c 100644
--- a/tests/migrations/test_commands.py
+++ b/tests/migrations/test_commands.py
@@ -184,7 +184,7 @@ class MakeMigrationsTests(MigrationTestBase):
with codecs.open(initial_file, 'r', encoding='utf-8') as fp:
content = fp.read()
- self.assertTrue('# encoding: utf8' in content)
+ self.assertTrue('# -*- coding: utf-8 -*-' in content)
self.assertTrue('migrations.CreateModel' in content)
if six.PY3:
diff --git a/tests/migrations/test_migrations/0001_initial.py b/tests/migrations/test_migrations/0001_initial.py
index 3544610eb4..581d536814 100644
--- a/tests/migrations/test_migrations/0001_initial.py
+++ b/tests/migrations/test_migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations/0002_second.py b/tests/migrations/test_migrations/0002_second.py
index 5da381677c..9dd60fade2 100644
--- a/tests/migrations/test_migrations/0002_second.py
+++ b/tests/migrations/test_migrations/0002_second.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_2/0001_initial.py b/tests/migrations/test_migrations_2/0001_initial.py
index cb15a04956..02cbd97fcc 100644
--- a/tests/migrations/test_migrations_2/0001_initial.py
+++ b/tests/migrations/test_migrations_2/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_conflict/0001_initial.py b/tests/migrations/test_migrations_conflict/0001_initial.py
index 3544610eb4..581d536814 100644
--- a/tests/migrations/test_migrations_conflict/0001_initial.py
+++ b/tests/migrations/test_migrations_conflict/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_conflict/0002_conflicting_second.py b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py
index cf83d7b036..4057636177 100644
--- a/tests/migrations/test_migrations_conflict/0002_conflicting_second.py
+++ b/tests/migrations/test_migrations_conflict/0002_conflicting_second.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_conflict/0002_second.py b/tests/migrations/test_migrations_conflict/0002_second.py
index 0595de83f0..c525ea08a0 100644
--- a/tests/migrations/test_migrations_conflict/0002_second.py
+++ b/tests/migrations/test_migrations_conflict/0002_second.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_custom_user/0001_initial.py b/tests/migrations/test_migrations_custom_user/0001_initial.py
index f8e6ce4b0d..d7c37151f1 100644
--- a/tests/migrations/test_migrations_custom_user/0001_initial.py
+++ b/tests/migrations/test_migrations_custom_user/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_squashed/0001_initial.py b/tests/migrations/test_migrations_squashed/0001_initial.py
index 3544610eb4..581d536814 100644
--- a/tests/migrations/test_migrations_squashed/0001_initial.py
+++ b/tests/migrations/test_migrations_squashed/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_squashed/0001_squashed_0002.py b/tests/migrations/test_migrations_squashed/0001_squashed_0002.py
index b357e3f6f8..a5f591cbf7 100644
--- a/tests/migrations/test_migrations_squashed/0001_squashed_0002.py
+++ b/tests/migrations/test_migrations_squashed/0001_squashed_0002.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_squashed/0002_second.py b/tests/migrations/test_migrations_squashed/0002_second.py
index 0595de83f0..c525ea08a0 100644
--- a/tests/migrations/test_migrations_squashed/0002_second.py
+++ b/tests/migrations/test_migrations_squashed/0002_second.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_migrations_unmigdep/0001_initial.py b/tests/migrations/test_migrations_unmigdep/0001_initial.py
index ff19085563..6503f9f05b 100644
--- a/tests/migrations/test_migrations_unmigdep/0001_initial.py
+++ b/tests/migrations/test_migrations_unmigdep/0001_initial.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
diff --git a/tests/migrations/test_optimizer.py b/tests/migrations/test_optimizer.py
index b73c41a698..346d30ae28 100644
--- a/tests/migrations/test_optimizer.py
+++ b/tests/migrations/test_optimizer.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from django.test import TestCase
from django.db.migrations.optimizer import MigrationOptimizer
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
index 6a85ba8ca3..58b5aa6cac 100644
--- a/tests/migrations/test_writer.py
+++ b/tests/migrations/test_writer.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import datetime
diff --git a/tests/model_regress/models.py b/tests/model_regress/models.py
index 82efb9c783..7dacfc9c90 100644
--- a/tests/model_regress/models.py
+++ b/tests/model_regress/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/modeladmin/models.py b/tests/modeladmin/models.py
index 8f57a9fa82..8457e60876 100644
--- a/tests/modeladmin/models.py
+++ b/tests/modeladmin/models.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from django.contrib.auth.models import User
from django.db import models
from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/template_tests/filters.py b/tests/template_tests/filters.py
index ad85d0cb0b..24efe7cc86 100644
--- a/tests/template_tests/filters.py
+++ b/tests/template_tests/filters.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
"""
Tests for template filters (as opposed to template tags).
diff --git a/tests/template_tests/test_context.py b/tests/template_tests/test_context.py
index dac74b36e3..c5ad3e1d50 100644
--- a/tests/template_tests/test_context.py
+++ b/tests/template_tests/test_context.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from unittest import TestCase
diff --git a/tests/template_tests/urls.py b/tests/template_tests/urls.py
index f3720bbda7..58d1a18bb6 100644
--- a/tests/template_tests/urls.py
+++ b/tests/template_tests/urls.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.conf.urls import patterns, url
diff --git a/tests/test_client/tests.py b/tests/test_client/tests.py
index a29d627000..a212f406a3 100644
--- a/tests/test_client/tests.py
+++ b/tests/test_client/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
"""
39. Testing using the Test Client
diff --git a/tests/text/tests.py b/tests/text/tests.py
index c14f3baf82..9ac6414b21 100644
--- a/tests/text/tests.py
+++ b/tests/text/tests.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.test import TestCase
diff --git a/tests/utils_tests/test_jslex.py b/tests/utils_tests/test_jslex.py
index 97e6dbc109..9def423969 100644
--- a/tests/utils_tests/test_jslex.py
+++ b/tests/utils_tests/test_jslex.py
@@ -1,5 +1,5 @@
+# -*- coding: utf-8 -*-
"""Tests for jslex."""
-# encoding: utf-8
# originally from https://bitbucket.org/ned/jslex
from django.test import TestCase
diff --git a/tests/view_tests/tests/test_json.py b/tests/view_tests/tests/test_json.py
index b236e60c7d..5570812c87 100644
--- a/tests/view_tests/tests/test_json.py
+++ b/tests/view_tests/tests/test_json.py
@@ -1,4 +1,4 @@
-# encoding: utf8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
import json
diff --git a/tests/view_tests/tests/test_specials.py b/tests/view_tests/tests/test_specials.py
index 0b933ac0de..a705b07faa 100644
--- a/tests/view_tests/tests/test_specials.py
+++ b/tests/view_tests/tests/test_specials.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.test import TestCase
diff --git a/tests/view_tests/urls.py b/tests/view_tests/urls.py
index edf1bc56db..25e0395432 100644
--- a/tests/view_tests/urls.py
+++ b/tests/view_tests/urls.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+# -*- coding: utf-8 -*-
from os import path
from django.conf.urls import patterns, url, include