Fix pep8/pylint errors

common/lib/xmodule/xmodule/combined_open_ended_module.py

@@ -84,7 +84,8 @@ class CombinedOpenEndedFields(object):
     display_name = String(
         display_name="Display Name",
         help="This name appears in the horizontal navigation at the top of the page.",
-        default="Open Ended Grading", scope=Scope.settings
+        default="Open Ended Grading",
+        scope=Scope.settings
     )
     current_task_number = Integer(help="Current task that the student is on.", default=0, scope=Scope.user_state)
     task_states = List(help="List of state dictionaries of each task within this module.", scope=Scope.user_state)

common/lib/xmodule/xmodule/html_module.py

@@ -167,9 +167,9 @@ class HtmlDescriptor(HtmlFields, XmlDescriptor, EditingDescriptor):
                                                     pathname=pathname)
 
         resource_fs.makedir(os.path.dirname(filepath), recursive=True, allow_recreate=True)
-        with resource_fs.open(filepath, 'w') as file:
+        with resource_fs.open(filepath, 'w') as filestream:
             html_data = self.data.encode('utf-8')
-            file.write(html_data)
+            filestream.write(html_data)
 
         # write out the relative name
         relname = path(pathname).basename()