refactor: Remove usage of ModelReprMixin.

analytics/models.py

@@ -1,14 +1,13 @@
 from django.db import models
 
 from zerver.models import Realm, UserProfile, Stream, Recipient
-from zerver.lib.str_utils import ModelReprMixin
 from zerver.lib.timestamp import floor_to_day
 
 import datetime
 
 from typing import Optional, Tuple, Union, Dict, Any, Text
 
-class FillState(ModelReprMixin, models.Model):
+class FillState(models.Model):
     property = models.CharField(max_length=40, unique=True)  # type: Text
     end_time = models.DateTimeField()  # type: datetime.datetime
 
@@ -40,14 +39,14 @@ def last_successful_fill(property):
     return fillstate.end_time - datetime.timedelta(hours=1)
 
 # would only ever make entries here by hand
-class Anomaly(ModelReprMixin, models.Model):
+class Anomaly(models.Model):
     info = models.CharField(max_length=1000)  # type: Text
 
     def __unicode__(self):
         # type: () -> Text
         return u"<Anomaly: %s... %s>" % (self.info, self.id)
 
-class BaseCount(ModelReprMixin, models.Model):
+class BaseCount(models.Model):
     # Note: When inheriting from BaseCount, you may want to rearrange
     # the order of the columns in the migration to make sure they
     # match how you'd like the table to be arranged.

docs/new-feature-tutorial.md

@@ -151,7 +151,7 @@ boolean field, `mandatory_topics`, to the Realm model in
 
 # zerver/models.py
 
-class Realm(ModelReprMixin, models.Model):
+class Realm(models.Model):
     # ...
     restricted_to_domain = models.BooleanField(default=True) # type: bool
     invite_required = models.BooleanField(default=False) # type: bool
@@ -169,7 +169,7 @@ dictionary.
 
 # zerver/models.py
 
-class Realm(ModelReprMixin, models.Model)
+class Realm(models.Model)
   # ...
   # Define the types of the various automatically managed properties
     property_types = dict(

zerver/models.py

@@ -24,7 +24,6 @@ from zerver.lib.cache import cache_with_key, flush_user_profile, flush_realm, \
     bot_dicts_in_realm_cache_key, realm_user_dict_fields, \
     bot_dict_fields, flush_message, bot_profile_cache_key
 from zerver.lib.utils import make_safe_digest, generate_random_token
-from zerver.lib.str_utils import ModelReprMixin
 from django.db import transaction
 from django.utils.timezone import now as timezone_now
 from django.contrib.sessions.models import Session
@@ -133,7 +132,7 @@ def get_realm_emoji_cache_key(realm):
     # type: (Realm) -> Text
     return u'realm_emoji:%s' % (realm.id,)
 
-class Realm(ModelReprMixin, models.Model):
+class Realm(models.Model):
     MAX_REALM_NAME_LENGTH = 40
     MAX_REALM_SUBDOMAIN_LENGTH = 40
     AUTHENTICATION_FLAGS = [u'Google', u'Email', u'GitHub', u'LDAP', u'Dev', u'RemoteUser']
@@ -369,7 +368,7 @@ def get_realm_domains(realm):
     # type: (Realm) -> List[Dict[str, Text]]
     return list(realm.realmdomain_set.values('domain', 'allow_subdomains'))
 
-class RealmEmoji(ModelReprMixin, models.Model):
+class RealmEmoji(models.Model):
     author = models.ForeignKey('UserProfile', blank=True, null=True, on_delete=CASCADE)
     realm = models.ForeignKey(Realm, on_delete=CASCADE)  # type: Realm
     # Second part of the regex (negative lookbehind) disallows names ending with one of the punctuation characters
@@ -493,7 +492,7 @@ def flush_realm_filter(sender, **kwargs):
 post_save.connect(flush_realm_filter, sender=RealmFilter)
 post_delete.connect(flush_realm_filter, sender=RealmFilter)
 
-class UserProfile(ModelReprMixin, AbstractBaseUser, PermissionsMixin):
+class UserProfile(AbstractBaseUser, PermissionsMixin):
     DEFAULT_BOT = 1
     """
     Incoming webhook bots are limited to only sending messages via webhooks.
@@ -865,7 +864,7 @@ def generate_email_token_for_stream():
     # type: () -> str
     return generate_random_token(32)
 
-class Stream(ModelReprMixin, models.Model):
+class Stream(models.Model):
     MAX_NAME_LENGTH = 60
     name = models.CharField(max_length=MAX_NAME_LENGTH, db_index=True)  # type: Text
     realm = models.ForeignKey(Realm, db_index=True, on_delete=CASCADE)  # type: Realm
@@ -921,7 +920,7 @@ post_delete.connect(flush_stream, sender=Stream)
 # Streams. The recipient table maps a globally unique recipient id
 # (used by the Message table) to the type-specific unique id (the
 # stream id, user_profile id, or huddle id).
-class Recipient(ModelReprMixin, models.Model):
+class Recipient(models.Model):
     type_id = models.IntegerField(db_index=True)  # type: int
     type = models.PositiveSmallIntegerField(db_index=True)  # type: int
     # Valid types are {personal, stream, huddle}
@@ -948,7 +947,7 @@ class Recipient(ModelReprMixin, models.Model):
         display_recipient = get_display_recipient(self)
         return u"<Recipient: %s (%d, %s)>" % (display_recipient, self.type_id, self.type)
 
-class MutedTopic(ModelReprMixin, models.Model):
+class MutedTopic(models.Model):
     user_profile = models.ForeignKey(UserProfile, on_delete=CASCADE)
     stream = models.ForeignKey(Stream, on_delete=CASCADE)
     recipient = models.ForeignKey(Recipient, on_delete=CASCADE)
@@ -961,7 +960,7 @@ class MutedTopic(ModelReprMixin, models.Model):
         # type: () -> Text
         return u"<MutedTopic: (%s, %s, %s)>" % (self.user_profile.email, self.stream.name, self.topic_name)
 
-class Client(ModelReprMixin, models.Model):
+class Client(models.Model):
     name = models.CharField(max_length=30, db_index=True, unique=True)  # type: Text
 
     def __unicode__(self):
@@ -1106,7 +1105,7 @@ def get_stream_recipients(stream_ids):
         type_id__in=stream_ids,
     )
 
-class AbstractMessage(ModelReprMixin, models.Model):
+class AbstractMessage(models.Model):
     sender = models.ForeignKey(UserProfile, on_delete=CASCADE)  # type: UserProfile
     recipient = models.ForeignKey(Recipient, on_delete=CASCADE)  # type: Recipient
     subject = models.CharField(max_length=MAX_SUBJECT_LENGTH, db_index=True)  # type: Text
@@ -1252,7 +1251,7 @@ def get_context_for_message(message):
 
 post_save.connect(flush_message, sender=Message)
 
-class Reaction(ModelReprMixin, models.Model):
+class Reaction(models.Model):
     user_profile = models.ForeignKey(UserProfile, on_delete=CASCADE)  # type: UserProfile
     message = models.ForeignKey(Message, on_delete=CASCADE)  # type: Message
     emoji_name = models.TextField()  # type: Text
@@ -1289,7 +1288,7 @@ class Reaction(ModelReprMixin, models.Model):
 #
 # UserMessage is the largest table in a Zulip installation, even
 # though each row is only 4 integers.
-class AbstractUserMessage(ModelReprMixin, models.Model):
+class AbstractUserMessage(models.Model):
     user_profile = models.ForeignKey(UserProfile, on_delete=CASCADE)  # type: UserProfile
     # WARNING: We removed the previously-final flag,
     # is_me_message, without clearing any values it might have had in
@@ -1358,7 +1357,7 @@ def parse_usermessage_flags(val):
     return flags
 
 
-class AbstractAttachment(ModelReprMixin, models.Model):
+class AbstractAttachment(models.Model):
     file_name = models.TextField(db_index=True)  # type: Text
     # path_id is a storage location agnostic representation of the path of the file.
     # If the path of a file is http://localhost:9991/user_uploads/a/b/abc/temp_file.py
@@ -1435,7 +1434,7 @@ def get_old_unclaimed_attachments(weeks_ago):
     old_attachments = Attachment.objects.filter(messages=None, create_time__lt=delta_weeks_ago)
     return old_attachments
 
-class Subscription(ModelReprMixin, models.Model):
+class Subscription(models.Model):
     user_profile = models.ForeignKey(UserProfile, on_delete=CASCADE)  # type: UserProfile
     recipient = models.ForeignKey(Recipient, on_delete=CASCADE)  # type: Recipient
     active = models.BooleanField(default=True)  # type: bool
@@ -1850,7 +1849,7 @@ EMAIL_TYPES = {
     'invitation_reminder': ScheduledEmail.INVITATION_REMINDER,
 }
 
-class RealmAuditLog(ModelReprMixin, models.Model):
+class RealmAuditLog(models.Model):
     realm = models.ForeignKey(Realm, on_delete=CASCADE)  # type: Realm
     acting_user = models.ForeignKey(UserProfile, null=True, related_name='+', on_delete=CASCADE)  # type: Optional[UserProfile]
     modified_user = models.ForeignKey(UserProfile, null=True, related_name='+', on_delete=CASCADE)  # type: Optional[UserProfile]