Merge pull request #1198 from edx/ned/fix-calling-classmethods

No need to invoke classmethods through self.__class__

common/lib/xmodule/xmodule/xml_module.py

@@ -378,7 +378,7 @@ class XmlDescriptor(XModuleDescriptor):
 
         # Get the definition
         xml_object = self.definition_to_xml(resource_fs)
-        self.__class__.clean_metadata_from_xml(xml_object)
+        self.clean_metadata_from_xml(xml_object)
 
         # Set the tag so we get the file path right
         xml_object.tag = self.category
@@ -401,7 +401,7 @@ class XmlDescriptor(XModuleDescriptor):
         if self.export_to_file():
             # Write the definition to a file
             url_path = name_to_pathname(self.url_name)
-            filepath = self.__class__._format_filepath(self.category, url_path)
+            filepath = self._format_filepath(self.category, url_path)
             resource_fs.makedir(os.path.dirname(filepath), recursive=True, allow_recreate=True)
             with resource_fs.open(filepath, 'w') as file:
                 file.write(etree.tostring(xml_object, pretty_print=True, encoding='utf-8'))

lms/lib/comment_client/models.py

@@ -91,7 +91,7 @@ class Model(object):
         pass
 
     def save(self):
-        self.__class__.before_save(self)
+        self.before_save(self)
         if self.id:   # if we have id already, treat this as an update
             url = self.url(action='put', params=self.attributes)
             response = perform_request('put', url, self.updatable_attributes())
@@ -100,7 +100,7 @@ class Model(object):
             response = perform_request('post', url, self.initializable_attributes())
         self.retrieved = True
         self.update_attributes(**response)
-        self.__class__.after_save(self)
+        self.after_save(self)
 
     def delete(self):
         url = self.url(action='delete', params=self.attributes)