refactor: pyupgrade in common_views, config_model_utils (#26915)

openedx/core/djangoapps/common_views/xblock.py

@@ -22,7 +22,7 @@ def xblock_resource(request, block_type, uri):  # pylint: disable=unused-argumen
         # then open whatever resource has been requested.
         xblock_class = XBlock.load_class(block_type, select=settings.XBLOCK_SELECT_FUNCTION)
         content = xblock_class.open_local_resource(uri)
-    except IOError:
+    except OSError:
         log.info('Failed to load xblock resource', exc_info=True)
         raise Http404  # lint-amnesty, pylint: disable=raise-missing-from
     except Exception:

openedx/core/djangoapps/config_model_utils/admin.py

@@ -14,7 +14,7 @@ class CourseOverviewField(forms.ModelChoiceField):
     def to_python(self, value):
         if value in self.empty_values:
             return None
-        return super(CourseOverviewField, self).to_python(CourseKey.from_string(value))  # lint-amnesty, pylint: disable=super-with-arguments
+        return super().to_python(CourseKey.from_string(value))
 
 
 class StackedConfigModelAdminForm(forms.ModelForm):
@@ -77,6 +77,6 @@ class StackedConfigModelAdmin(ConfigurationModelAdmin):
         """
         Return all field names, excluding reverse foreign key relationships.
         """
-        names = super(StackedConfigModelAdmin, self).get_displayable_field_names()  # lint-amnesty, pylint: disable=super-with-arguments
+        names = super().get_displayable_field_names()
         fixed_names = ['id', 'change_date', 'changed_by'] + list(self.model.KEY_FIELDS)
         return fixed_names + [name for name in names if name not in fixed_names]

openedx/core/djangoapps/config_model_utils/models.py

@@ -50,7 +50,7 @@ class StackedConfigurationModel(ConfigurationModel):
     A ConfigurationModel that stacks Global, Site, Org, Course, and Course Run level
     configuration values.
     """
-    class Meta(object):
+    class Meta:
         abstract = True
         indexes = [
             # This index optimizes the .object.current_set() query
@@ -314,7 +314,7 @@ class StackedConfigurationModel(ConfigurationModel):
         else:
             site_id = site.id
 
-        return super(StackedConfigurationModel, cls).cache_key_name(site_id, org, org_course, course_key)
+        return super().cache_key_name(site_id, org, org_course, course_key)
 
     @classmethod
     def _org_from_org_course(cls, org_course):
@@ -322,7 +322,7 @@ class StackedConfigurationModel(ConfigurationModel):
 
     @classmethod
     def _org_course_from_course_key(cls, course_key):
-        return u"{}+{}".format(course_key.org, course_key.course)
+        return f"{course_key.org}+{course_key.course}"
 
     @classmethod
     @request_cached()