[1.7.x] Fixed #23892 -- Made deconstructible classes forwards compatible (8014001d) · Commits · Dom Sekotill / django

django/core/files/storage.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ class FileSystemStorage(Storage):
		"""

		def __init__(self, location=None, base_url=None, file_permissions_mode=None,
		directory_permissions_mode=None):
		directory_permissions_mode=None, **kwargs):
		if location is None:
		location = settings.MEDIA_ROOT
		self.base_location = location

django/core/validators.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ class RegexValidator(object):
		inverse_match = False
		flags = 0

		def __init__(self, regex=None, message=None, code=None, inverse_match=None, flags=None):
		def __init__(self, regex=None, message=None, code=None, inverse_match=None, flags=None, **kwargs):
		if regex is not None:
		self.regex = regex
		if message is not None:
		@@ -132,7 +132,7 @@ class EmailValidator(object):
		re.IGNORECASE)
		domain_whitelist = ['localhost']

		def __init__(self, message=None, code=None, whitelist=None):
		def __init__(self, message=None, code=None, whitelist=None, **kwargs):
		if message is not None:
		self.message = message
		if code is not None:
		@@ -236,7 +236,7 @@ class BaseValidator(object):
		message = _('Ensure this value is %(limit_value)s (it is %(show_value)s).')
		code = 'limit_value'

		def __init__(self, limit_value):
		def __init__(self, limit_value, **kwargs):
		self.limit_value = limit_value

		def __call__(self, value):

django/db/migrations/operations/base.py

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ class Operation(object):
		self._constructor_args = (args, kwargs)
		return self

		def __init__(self, **kwargs):
		pass

		def deconstruct(self):
		"""
		Returns a 3-tuple of class import path (or just name if it lives

django/db/migrations/operations/fields.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ class AddField(Operation):
		Adds a field to a model.
		"""

		def __init__(self, model_name, name, field, preserve_default=True):
		def __init__(self, model_name, name, field, preserve_default=True, **kwargs):
		self.model_name = model_name
		self.name = name
		self.field = field
		@@ -67,7 +67,7 @@ class RemoveField(Operation):
		Removes a field from a model.
		"""

		def __init__(self, model_name, name):
		def __init__(self, model_name, name, **kwargs):
		self.model_name = model_name
		self.name = name

		@@ -104,7 +104,7 @@ class AlterField(Operation):
		Alters a field's database column (e.g. null, max_length) to the provided new field
		"""

		def __init__(self, model_name, name, field, preserve_default=True):
		def __init__(self, model_name, name, field, preserve_default=True, **kwargs):
		self.model_name = model_name
		self.name = name
		self.field = field
		@@ -166,7 +166,7 @@ class RenameField(Operation):
		Renames a field on the model. Might affect db_column too.
		"""

		def __init__(self, model_name, old_name, new_name):
		def __init__(self, model_name, old_name, new_name, **kwargs):
		self.model_name = model_name
		self.old_name = old_name
		self.new_name = new_name

django/db/migrations/operations/models.py

+8 −8

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@ class CreateModel(Operation):

		serialization_expand_args = ['fields', 'options']

		def __init__(self, name, fields, options=None, bases=None):
		def __init__(self, name, fields, options=None, bases=None, **kwargs):
		self.name = name
		self.fields = fields
		self.options = options or {}
		@@ -76,7 +76,7 @@ class DeleteModel(Operation):
		Drops a model's table.
		"""

		def __init__(self, name):
		def __init__(self, name, **kwargs):
		self.name = name

		def state_forwards(self, app_label, state):
		@@ -106,7 +106,7 @@ class RenameModel(Operation):
		Renames a model.
		"""

		def __init__(self, old_name, new_name):
		def __init__(self, old_name, new_name, **kwargs):
		self.old_name = old_name
		self.new_name = new_name

		@@ -192,7 +192,7 @@ class AlterModelTable(Operation):
		Renames a model's table
		"""

		def __init__(self, name, table):
		def __init__(self, name, table, **kwargs):
		self.name = name
		self.table = table

		@@ -236,7 +236,7 @@ class AlterUniqueTogether(Operation):
		"""
		option_name = "unique_together"

		def __init__(self, name, unique_together):
		def __init__(self, name, unique_together, **kwargs):
		self.name = name
		unique_together = normalize_together(unique_together)
		self.unique_together = set(tuple(cons) for cons in unique_together)
		@@ -274,7 +274,7 @@ class AlterIndexTogether(Operation):
		"""
		option_name = "index_together"

		def __init__(self, name, index_together):
		def __init__(self, name, index_together, **kwargs):
		self.name = name
		index_together = normalize_together(index_together)
		self.index_together = set(tuple(cons) for cons in index_together)
		@@ -310,7 +310,7 @@ class AlterOrderWithRespectTo(Operation):
		Represents a change with the order_with_respect_to option.
		"""

		def __init__(self, name, order_with_respect_to):
		def __init__(self, name, order_with_respect_to, **kwargs):
		self.name = name
		self.order_with_respect_to = order_with_respect_to

		@@ -362,7 +362,7 @@ class AlterModelOptions(Operation):
		"verbose_name_plural",
		]

		def __init__(self, name, options):
		def __init__(self, name, options, **kwargs):
		self.name = name
		self.options = options