Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #20977 -- Fixed writing migrations to disk on Python 3

  • Loading branch information...
commit bd8e1a354cb1fde5e5411e3c729a0d179f4eb37b 1 parent 8625c7a
@MarkusH MarkusH authored timgraham committed
View
14 django/core/management/commands/makemigrations.py
@@ -52,7 +52,7 @@ def handle(self, *app_labels, **options):
changes = autodetector.changes(graph=loader.graph, trim_to_apps=app_labels or None)
# No changes? Tell them.
- if not changes:
+ if not changes and self.verbosity >= 1:
if len(app_labels) == 1:
self.stdout.write("No changes detected in app '%s'" % app_labels.pop())
elif len(app_labels) > 1:
@@ -63,13 +63,15 @@ def handle(self, *app_labels, **options):
directory_created = {}
for app_label, migrations in changes.items():
- self.stdout.write(self.style.MIGRATE_HEADING("Migrations for '%s':" % app_label) + "\n")
+ if self.verbosity >= 1:
+ self.stdout.write(self.style.MIGRATE_HEADING("Migrations for '%s':" % app_label) + "\n")
for migration in migrations:
# Describe the migration
writer = MigrationWriter(migration)
- self.stdout.write(" %s:\n" % (self.style.MIGRATE_LABEL(writer.filename),))
- for operation in migration.operations:
- self.stdout.write(" - %s\n" % operation.describe())
+ if self.verbosity >= 1:
+ self.stdout.write(" %s:\n" % (self.style.MIGRATE_LABEL(writer.filename),))
+ for operation in migration.operations:
+ self.stdout.write(" - %s\n" % operation.describe())
# Write it
migrations_directory = os.path.dirname(writer.path)
if not directory_created.get(app_label, False):
@@ -80,5 +82,5 @@ def handle(self, *app_labels, **options):
open(init_path, "w").close()
# We just do this once per app
directory_created[app_label] = True
- with open(writer.path, "w") as fh:
+ with open(writer.path, "wb") as fh:
fh.write(writer.as_string())
View
20 tests/migrations/models.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models
+from django.db.models.loading import BaseAppCache
+from django.utils.encoding import python_2_unicode_compatible
+
+
+@python_2_unicode_compatible
+class UnicodeModel(models.Model):
+ title = models.CharField('ÚÑÍ¢ÓÐÉ', max_length=20, default='“Ðjáñgó”')
+
+ class Meta:
+ # Disable auto loading of this model as we load it on our own
+ app_cache = BaseAppCache()
+ verbose_name = 'úñí©óðé µóðéø'
+ verbose_name_plural = 'úñí©óðé µóðéøß'
+
+ def __str__(self):
+ return self.title
View
75 tests/migrations/test_commands.py
@@ -1,11 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+import os
+import shutil
+
from django.core.management import call_command
+from django.db.models.loading import cache
from django.test.utils import override_settings
+from django.utils import six
+from django.utils._os import upath
+from django.utils.encoding import force_text
+
+from .models import UnicodeModel
from .test_base import MigrationTestBase
-class CommandTests(MigrationTestBase):
+class MigrateTests(MigrationTestBase):
"""
- Tests running the commands (migrate, makemigrations).
+ Tests running the migrate command.
"""
@override_settings(MIGRATION_MODULES={"migrations": "migrations.test_migrations"})
@@ -35,3 +47,62 @@ def test_migrate(self):
self.assertTableNotExists("migrations_author")
self.assertTableNotExists("migrations_tribble")
self.assertTableNotExists("migrations_book")
+
+
+class MakeMigrationsTests(MigrationTestBase):
+ """
+ Tests running the makemigrations command.
+ """
+
+ def setUp(self):
+ self._cwd = os.getcwd()
+ self.test_dir = os.path.abspath(os.path.dirname(upath(__file__)))
+ self.migration_dir = os.path.join(self.test_dir, 'migrations')
+
+ def tearDown(self):
+ os.chdir(self.test_dir)
+ try:
+ self._rmrf(self.migration_dir)
+ except OSError:
+ pass
+ os.chdir(self._cwd)
+
+ def _rmrf(self, dname):
+ if os.path.commonprefix([self.test_dir, os.path.abspath(dname)]) != self.test_dir:
+ return
+ shutil.rmtree(dname)
+
+ def test_files_content(self):
+ self.assertTableNotExists("migrations_unicodemodel")
+ cache.register_models('migrations', UnicodeModel)
+ call_command("makemigrations", "migrations", verbosity=0)
+
+ init_file = os.path.join(self.migration_dir, "__init__.py")
+
+ # Check for existing __init__.py file in migrations folder
+ self.assertTrue(os.path.exists(init_file))
+
+ with open(init_file, 'r') as fp:
+ content = force_text(fp.read())
+ self.assertEqual(content, '')
+
+ initial_file = os.path.join(self.migration_dir, "0001_initial.py")
+
+ # Check for existing 0001_initial.py file in migration folder
+ self.assertTrue(os.path.exists(initial_file))
+
+ with open(initial_file, 'r') as fp:
+ content = force_text(fp.read())
+ self.assertTrue('# encoding: utf8' in content)
+ self.assertTrue('migrations.CreateModel' in content)
+
+ if six.PY3:
+ self.assertTrue('úñí©óðé µóðéø' in content) # Meta.verbose_name
+ self.assertTrue('úñí©óðé µóðéøß' in content) # Meta.verbose_name_plural
+ self.assertTrue('ÚÑÍ¢ÓÐÉ' in content) # title.verbose_name
+ self.assertTrue('“Ðjáñgó”' in content) # title.default
+ else:
+ self.assertTrue('\\xfa\\xf1\\xed\\xa9\\xf3\\xf0\\xe9 \\xb5\\xf3\\xf0\\xe9\\xf8' in content) # Meta.verbose_name
+ self.assertTrue('\\xfa\\xf1\\xed\\xa9\\xf3\\xf0\\xe9 \\xb5\\xf3\\xf0\\xe9\\xf8\\xdf' in content) # Meta.verbose_name_plural
+ self.assertTrue('\\xda\\xd1\\xcd\\xa2\\xd3\\xd0\\xc9' in content) # title.verbose_name
+ self.assertTrue('\\u201c\\xd0j\\xe1\\xf1g\\xf3\\u201d' in content) # title.default
Please sign in to comment.
Something went wrong with that request. Please try again.