      def __str__(self):
          return 'Bookmark: %s' % self.url
  
  
  @python_2_unicode_compatible
  class Note(models.Model):
      """
      A textual note that may have multiple tags attached.
      """
      text = models.TextField()
 
</s> remove @python_2_unicode_compatible
 </s> add  </s> remove class ErrorDetail(six.text_type):
 </s> add class ErrorDetail(str): </s> remove             raise ParseError('JSON parse error - %s' % six.text_type(exc))
 </s> add             raise ParseError('JSON parse error - %s' % str(exc)) </s> remove             raise ParseError('Multipart form parse error - %s' % six.text_type(exc))
 </s> add             raise ParseError('Multipart form parse error - %s' % str(exc)) </s> remove         @python_2_unicode_compatible
        class MockLazyStr(object):
 </s> add         class MockLazyStr:
      def __str__(self):
          return 'Bookmark: %s' % self.url
  
  

  class Note(models.Model):
      """
      A textual note that may have multiple tags attached.
      """
      text = models.TextField()
keep keep keep keep replace keep keep keep keep keep
 Dropped Python 2 compatibility. (#6615)

Thanks to Jon Dufresne (@jdufresne) for review.

Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
Co-authored-by: Rizwan Mansuri <Rizwan@webbyfox.com> 
tests/generic_relations/models.py