Merge branch 'master' into bbeggs/version

enterprise/api/v1/serializers.py

@@ -19,7 +19,7 @@
 from django.core import exceptions as django_exceptions
 from django.utils.translation import gettext_lazy as _
 
-from enterprise import models, utils
+from enterprise import models, utils  # pylint: disable=cyclic-import
 from enterprise.api.v1.fields import Base64EmailCSVField
 from enterprise.api_client.lms import ThirdPartyAuthApiClient
 from enterprise.constants import ENTERPRISE_ADMIN_ROLE, ENTERPRISE_PERMISSION_GROUPS, DefaultColors

enterprise/api_client/client.py

@@ -13,7 +13,7 @@
 from django.apps import apps
 from django.conf import settings
 
-from enterprise.utils import NotConnectedToOpenEdX
+from enterprise.utils import NotConnectedToOpenEdX  # pylint: disable=cyclic-import
 
 try:
     from openedx.core.djangoapps.oauth_dispatch import jwt as JwtBuilder

integrated_channels/canvas/client.py

@@ -11,10 +11,13 @@
 
 from django.apps import apps
 
-from integrated_channels.canvas.utils import CanvasUtil
+from integrated_channels.canvas.utils import CanvasUtil  # pylint: disable=cyclic-import
 from integrated_channels.exceptions import ClientError
 from integrated_channels.integrated_channel.client import IntegratedChannelApiClient, IntegratedChannelHealthStatus
-from integrated_channels.utils import generate_formatted_log, refresh_session_if_expired
+from integrated_channels.utils import (  # pylint: disable=cyclic-import
+    generate_formatted_log,
+    refresh_session_if_expired,
+)
 
 LOGGER = logging.getLogger(__name__)
 

integrated_channels/moodle/client.py

@@ -250,6 +250,7 @@ def get_course_final_grade_module(self, course_id):
         """
         response = self._get_course_contents(course_id)
         course_module_id = None
+        module_name = None
         if isinstance(response.json(), list):
             for course in response.json():
                 if course.get('name') == 'General':