From 10427646b887586bf89dacb3b5208b3ad2d17308 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Thu, 10 Dec 2015 09:13:05 -0500 Subject: Fixed #25909 -- Added unicode_literals import to apps.py generated by startapp. --- tests/admin_scripts/tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/admin_scripts') diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index 755fb0b1d4..ea7c8a25f0 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -610,17 +610,17 @@ class DjangoAdminSettingsDirectory(AdminScriptTestCase): self.addCleanup(shutil.rmtree, app_path) self.assertNoOutput(err) self.assertTrue(os.path.exists(app_path)) + unicode_literals_import = "from __future__ import unicode_literals\n" with open(os.path.join(app_path, 'apps.py'), 'r') as f: content = f.read() self.assertIn("class SettingsTestConfig(AppConfig)", content) self.assertIn("name = 'settings_test'", content) + if not PY3: + self.assertIn(unicode_literals_import, content) if not PY3: with open(os.path.join(app_path, 'models.py'), 'r') as fp: content = fp.read() - self.assertIn( - "from __future__ import unicode_literals\n", - content, - ) + self.assertIn(unicode_literals_import, content) def test_setup_environ_custom_template(self): "directory: startapp creates the correct directory with a custom template" -- cgit v1.3