Removes whitespace from ale index keys, updates tests to test for err…

…oneous whitespace
shidarin · May 28, 2014 · 6e42c2b · 6e42c2b
1 parent 11543b8
commit 6e42c2b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/cdl_convert/cdl_convert.py b/cdl_convert/cdl_convert.py
@@ -1850,7 +1850,7 @@ def parse_ale(edl_file):
                 continue
             elif section['column']:
                 for i, field in enumerate(line.split('\t')):
-                    ale_indexes[field] = i
+                    ale_indexes[field.strip()] = i
                 section['column'] = False
             elif section['data']:
                 cdl_data = line.split('\t')

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -12,4 +12,4 @@
 
 if __name__ == '__main__':
     unittest.main()
-    
+
diff --git a/tests/test_ale.py b/tests/test_ale.py
@@ -56,11 +56,11 @@
 FPS\t24
 
 Column
-Start\tEnd\tHandle Length\tAvid Clip Name\tASC_SAT\tASC_SOP\tScan Filename\tTotal Frame Count
+Start\tEnd\tHandle Length\tAvid Clip Name\tASC_SAT\tASC_SOP\tScan Filename
 
 Data
 """
-ALE_LINE_SHORT = "{tcIn}\t{tcOut}\t{handleLen}\t{avidClip}\t{sat}\t({slopeR} {slopeG} {slopeB})({offsetR} {offsetG} {offsetB})({powerR} {powerG} {powerB})\t{filename}\t{frames}\n"
+ALE_LINE_SHORT = "{tcIn}\t{tcOut}\t{handleLen}\t{avidClip}\t{sat}\t({slopeR} {slopeG} {slopeB})({offsetR} {offsetG} {offsetB})({powerR} {powerG} {powerB})\t{filename}\n"
 
 # misc ========================================================================
 
@@ -365,8 +365,7 @@ def buildALELine(slope, offset, power, sat, filename, short=False):
             powerR=power[0],
             powerG=power[1],
             powerB=power[2],
-            filename=filename,
-            frames=tc.durFrames
+            filename=filename
         )
 
     return ale