diff --git a/analytics/migrations/0001_initial.py b/analytics/migrations/0001_initial.py index e349888bb9..33bfaf00c2 100644 --- a/analytics/migrations/0001_initial.py +++ b/analytics/migrations/0001_initial.py @@ -19,7 +19,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('info', models.CharField(max_length=1000)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='HuddleCount', @@ -33,7 +33,7 @@ class Migration(migrations.Migration): ('value', models.BigIntegerField()), ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='InstallationCount', @@ -45,7 +45,7 @@ class Migration(migrations.Migration): ('value', models.BigIntegerField()), ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='RealmCount', @@ -59,7 +59,7 @@ class Migration(migrations.Migration): ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='StreamCount', @@ -73,7 +73,7 @@ class Migration(migrations.Migration): ('value', models.BigIntegerField()), ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='UserCount', @@ -87,7 +87,7 @@ class Migration(migrations.Migration): ('value', models.BigIntegerField()), ('anomaly', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='analytics.Anomaly', null=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.AlterUniqueTogether( name='usercount', diff --git a/analytics/migrations/0003_fillstate.py b/analytics/migrations/0003_fillstate.py index 618b7ed177..64d3d33428 100644 --- a/analytics/migrations/0003_fillstate.py +++ b/analytics/migrations/0003_fillstate.py @@ -19,6 +19,6 @@ class Migration(migrations.Migration): ('state', models.PositiveSmallIntegerField()), ('last_modified', models.DateTimeField(auto_now=True)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), ] diff --git a/zerver/lib/str_utils.py b/zerver/lib/str_utils.py index daefb74ada..1cc13bf1b1 100644 --- a/zerver/lib/str_utils.py +++ b/zerver/lib/str_utils.py @@ -53,22 +53,3 @@ def force_str(s: Union[str, bytes], encoding: str='utf-8') -> str: return s.decode(encoding) else: raise TypeError("force_str expects a string type") - -class ModelReprMixin: - """ - This mixin provides a python 2 and 3 compatible way of handling string representation of a model. - When declaring a model, inherit this mixin before django.db.models.Model. - Define __unicode__ on your model which returns a str object. - This mixin will automatically define __str__ and __repr__. - """ - - def __unicode__(self) -> str: - # Originally raised an exception, but Django (e.g. the ./manage.py shell) - # was catching the exception and not displaying any sort of error - return "Implement __unicode__ in your subclass of ModelReprMixin!" - - def __str__(self) -> str: - return force_str(self.__unicode__()) - - def __repr__(self) -> str: - return force_str(self.__unicode__()) diff --git a/zerver/migrations/0044_reaction.py b/zerver/migrations/0044_reaction.py index 52a8910ca8..cf97197542 100644 --- a/zerver/migrations/0044_reaction.py +++ b/zerver/migrations/0044_reaction.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): ('message', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Message')), ('emoji_name', models.TextField()), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.AlterUniqueTogether( name='reaction', diff --git a/zerver/migrations/0067_archived_models.py b/zerver/migrations/0067_archived_models.py index c140d1aa2a..317f1c1cae 100644 --- a/zerver/migrations/0067_archived_models.py +++ b/zerver/migrations/0067_archived_models.py @@ -30,7 +30,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='ArchivedMessage', @@ -54,7 +54,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.CreateModel( name='ArchivedUserMessage', @@ -68,7 +68,7 @@ class Migration(migrations.Migration): options={ 'abstract': False, }, - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.AddField( model_name='archivedattachment', diff --git a/zerver/migrations/0101_muted_topic.py b/zerver/migrations/0101_muted_topic.py index 34dcbb89c3..3ff8ac2389 100644 --- a/zerver/migrations/0101_muted_topic.py +++ b/zerver/migrations/0101_muted_topic.py @@ -23,7 +23,7 @@ class Migration(migrations.Migration): ('stream', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='zerver.Stream')), ('user_profile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], - bases=(zerver.lib.str_utils.ModelReprMixin, models.Model), + bases=(models.Model,), ), migrations.AlterUniqueTogether( name='mutedtopic',