BOM-2315

Apply pylint-amnesty.

openedx/core/djangoapps/ace_common/__init__.py

@@ -1,4 +1,5 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
+"""
+# lint-amnesty, pylint: disable=django-not-configured
 ace_common is a Django App that provides common utilities and templates
 for edx-platform applications that use ACE as their messaging framework.
 """

openedx/core/djangoapps/bookmarks/__init__.py

@@ -1,4 +1,5 @@
-"""  # lint-amnesty, pylint: disable=django-not-configured
+"""
+# lint-amnesty, pylint: disable=django-not-configured
 # lint-amnesty, pylint: disable=django-not-configured  # lint-amnesty, pylint: disable=django-not-configured
 Bookmarks module.
 """

openedx/core/djangoapps/bookmarks/models.py

@@ -6,7 +6,7 @@ Models for Bookmarks.
 import logging
 
 import six
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.db import models
 from django.utils.encoding import python_2_unicode_compatible
 from jsonfield.fields import JSONField
@@ -42,7 +42,6 @@ def parse_path_data(path_data):
     return path
 
 
-@python_2_unicode_compatible
 class Bookmark(TimeStampedModel):
     """
     Bookmarks model.
@@ -193,7 +192,6 @@ class Bookmark(TimeStampedModel):
         return path_data
 
 
-@python_2_unicode_compatible
 class XBlockCache(TimeStampedModel):
     """
     XBlockCache model to store info about xblocks.