Style work

ptulsconv/commands.py

@@ -1,10 +1,11 @@
-import ptulsconv
 import json
-import sys
 import os.path
+import sys
+from xml.etree.ElementTree import TreeBuilder, tostring
+import ptulsconv
+
 
 def fmp_dump(data, input_file_name, output):
-    from xml.etree.ElementTree import TreeBuilder, ElementTree, tostring
     doc = TreeBuilder(element_factory=None)
 
     # field_map maps tags in the text export to fields in FMPXMLRESULT
@@ -91,8 +92,7 @@ def fmp_dump(data, input_file_name, output):
     output.write(xmlstr)
 
 
-
-def convert(input_file, format='fmpxml', start=None, end=None, output=sys.stdout):
+def convert(input_file, output_format='fmpxml', start=None, end=None, output=sys.stdout):
     with open(input_file, 'r') as file:
         ast = ptulsconv.protools_text_export_grammar.parse(file.read())
         dict_parser = ptulsconv.DictionaryParserVisitor()
@@ -104,7 +104,6 @@ def convert(input_file, format='fmpxml', start=None, end=None, output=sys.stdout
         parsed = tagxform.transform(tcxform.transform(parsed))
 
         if start is not None and end is not None:
-
             start_fs = tcxform.convert_time(start,
                                             frame_rate=parsed['header']['timecode_format'],
                                             drop_frame=parsed['header']['timecode_drop_frame'])['frame_count']
@@ -116,8 +115,7 @@ def convert(input_file, format='fmpxml', start=None, end=None, output=sys.stdout
             subclipxform = ptulsconv.transformations.SubclipOfSequence(start=start_fs, end=end_fs)
             parsed = subclipxform.transform(parsed)
 
-        if format == 'json':
+        if output_format == 'json':
             json.dump(parsed, output)
-        elif format == 'fmpxml':
+        elif output_format == 'fmpxml':
             fmp_dump(parsed, input_file, output)
-