Fix functions to use python naming conventions

Author: joshkalpin

generator.py

@@ -12,9 +12,9 @@ def _prettify(elem):
         return reparsed.toprettyxml(indent="  ")
 
     @staticmethod
-    def generateProcedure(procedure):
+    def generate_procedure(procedure):
         procedureElement = ElementTree.Element('Procedure')
-        procedureElement.attrib = procedure.generatePropertiesDictionary()
+        procedureElement.attrib = procedure.generate_properties_dict()
 
         for page in procedure.pages:
             pageElement = ElementTree.SubElement(procedureElement, 'Page')
@@ -23,7 +23,7 @@ def generateProcedure(procedure):
                 ElementTree.SubElement(
                     pageElement,
                     'Element',
-                    element.generatePropertiesDictionary()
+                    element.generate_properties_dict()
                 )
 
         return Generator._prettify(procedureElement)

main.py

@@ -14,9 +14,9 @@ def main():
     try:
         tree = ElementTree.parse(args[1])
         procedureElement = tree.getroot()
-        procedure = Parser.parseProcedure(procedureElement)
+        procedure = Parser.parse_procedure(procedureElement)
 
-        generatedProc = Generator.generateProcedure(procedure)
+        generatedProc = Generator.generate_procedure(procedure)
         with open('out.xml', 'w') as outfile:
             outfile.write(generatedProc)
 

models.py

@@ -6,7 +6,7 @@ def __init__(self, eleType, eleId, concept, question, answer):
         self.question = question
         self.answer = answer
 
-    def generatePropertiesDictionary(self):
+    def generate_properties_dict(self):
         return {
             'type': self.eleType,
             'id': self.eleId,
@@ -16,7 +16,7 @@ def generatePropertiesDictionary(self):
         }
 
     @staticmethod
-    def _validateAttributes(attrib):
+    def _validate_attributes(attrib):
         if 'type' not in attrib:
             raise Exception('Element', 'type')
 
@@ -33,17 +33,17 @@ def _validateAttributes(attrib):
             raise Exception('Element', 'answer')
 
     @staticmethod
-    def createElement(attrib):
-        Element._validateAttributes(attrib)
+    def create_element(attrib):
+        Element._validate_attributes(attrib)
 
         if attrib['type'] == 'MULTI_SELECT':
-            return MultiSelectElement._createElement(attrib)
+            return MultiSelectElement._create_element(attrib)
         if attrib['type'] == 'ENTRY':
-            return EntryElement._createElement(attrib)
+            return EntryElement._create_element(attrib)
         if attrib['type'] == 'PICTURE':
-            return PictureElement._createElement(attrib)
+            return PictureElement._create_element(attrib)
         if attrib['type'] == 'GPS':
-            return GPSElement._createElement(attrib)
+            return GPSElement._create_element(attrib)
 
         raise Exception('Element', 'type')
 
@@ -60,20 +60,20 @@ def __init__(self, eleId, concept, question, choices, answer):
 
         self.choices = choices
 
-    def generatePropertiesDictionary(self):
-        propDict = super(MultiSelectElement, self).generatePropertiesDictionary()
+    def generate_properties_dict(self):
+        propDict = super(MultiSelectElement, self).generate_properties_dict()
         propDict['choices'] = self.choices
 
         return propDict
 
     @staticmethod
-    def _validateAttributes(attrib):
+    def _validate_attributes(attrib):
         if 'choices' not in attrib:
             raise Exception('MultiSelectElement', 'choices')
 
     @staticmethod
-    def _createElement(attrib):
-        MultiSelectElement._validateAttributes(attrib)
+    def _create_element(attrib):
+        MultiSelectElement._validate_attributes(attrib)
 
         eleId = attrib['id']
         concept = attrib['concept']
@@ -101,15 +101,15 @@ def __init__(self, eleId, concept, question, answer, numeric=None):
         )
         self.numeric = numeric
 
-    def generatePropertiesDictionary(self):
-        propDict = super(EntryElement, self).generatePropertiesDictionary()
+    def generate_properties_dict(self):
+        propDict = super(EntryElement, self).generate_properties_dict()
         if self.numeric is not None:
             propDict['numeric'] = self.numeric
 
         return propDict
 
     @staticmethod
-    def _createElement(attrib):
+    def _create_element(attrib):
         eleId = attrib['id']
         concept = attrib['concept']
         question = attrib['question']
@@ -136,7 +136,7 @@ def __init__(self, eleId, concept, question, answer):
         )
 
     @staticmethod
-    def _createElement(attrib):
+    def _create_element(attrib):
         eleId = attrib['id']
         concept = attrib['concept']
         question = attrib['question']
@@ -161,7 +161,7 @@ def __init__(self, eleId, concept, question, answer):
         )
 
     @staticmethod
-    def _createElement(attrib):
+    def _create_element(attrib):
         eleId = attrib['id']
         concept = attrib['concept']
         question = attrib['question']
@@ -189,14 +189,14 @@ def __init__(self, title, author):
     def __contains__(self, page):
         return page in self.pages
 
-    def generatePropertiesDictionary(self):
+    def generate_properties_dict(self):
         return {
             'title': self.title,
             'author': self.author
         }
 
     @staticmethod
-    def createProcedure(attrib):
+    def create_procedure(attrib):
         if 'title' not in attrib:
             raise Exception('Procedure', 'title')
 

parser.py

@@ -3,39 +3,39 @@
 
 class Parser(object):
     @staticmethod
-    def parseElement(elementElement):
+    def parse_element(elementElement):
         if elementElement.tag != 'Element':
             raise Exception('ElementElement', 'tag')
 
-        element = Element.createElement(elementElement.attrib)
+        element = Element.create_element(elementElement.attrib)
 
         return element
 
     @staticmethod
-    def parsePage(pageElement):
+    def parse_page(pageElement):
         if pageElement.tag != 'Page':
             raise Exception('PageElement', 'tag')
 
         page = Page()
 
         for pageChild in pageElement:
             if pageChild.tag == 'Element':
-                element = Parser.parseElement(pageChild)
+                element = Parser.parse_element(pageChild)
                 page.elements.append(element)
             else:
                 raise Exception('Page', 'child')
 
         return page
 
     @staticmethod
-    def parseProcedure(procedureElement):
+    def parse_procedure(procedureElement):
         if procedureElement.tag != 'Procedure':
             raise Exception('ProcedureElement', 'tag')
 
-        procedure = Procedure.createProcedure(procedureElement.attrib)
+        procedure = Procedure.create_procedure(procedureElement.attrib)
 
         for pageElement in procedureElement:
-            page = Parser.parsePage(pageElement)
+            page = Parser.parse_page(pageElement)
             procedure.pages.append(page)
 
         return procedure