From 1e7aea30d4fcebfb2f7149912d5ea9a544beeb9a Mon Sep 17 00:00:00 2001
From: Jamie Hardt <jamiehardt@me.com>
Date: Sat, 1 Dec 2018 12:34:38 -0800
Subject: [PATCH] Added a channel map test, fixed some bugs reading audio
 channels

---
 pycmx/parse_cmx.py            |  16 ++++++----------
 pycmx/parse_cmx_statements.py |   2 +-
 tests/.test_parse.py.swp      | Bin 12288 -> 12288 bytes
 tests/test_parse.py           |   6 ++++++
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pycmx/parse_cmx.py b/pycmx/parse_cmx.py
index a1960c1..c856ace 100644
--- a/pycmx/parse_cmx.py
+++ b/pycmx/parse_cmx.py
@@ -50,13 +50,9 @@ class CmxChannelMap:
         }
 
 
-    def __init__(self, v=False, a1=False, a2=False, a3=False, a4=False):
-        self._audio_channel_set = set()
+    def __init__(self, v=False, audio_channels=set()):
+        self._audio_channel_set = audio_channels 
         self.v = v
-        self.a1 = a1
-        self.a2 = a2
-        self.a3 = a3
-        self.a4 = a4
 
     @property
     def a1(self):
@@ -70,7 +66,7 @@ class CmxChannelMap:
     def a2(self):
         return self.get_audio_channel(2)
 
-    @a1.setter
+    @a2.setter
     def a2(self,val):
         self.set_audio_channel(2,val)
 
@@ -78,7 +74,7 @@ class CmxChannelMap:
     def a3(self):
         return self.get_audio_channel(3)
 
-    @a1.setter
+    @a3.setter
     def a3(self,val):
         self.set_audio_channel(3,val)
     
@@ -86,7 +82,7 @@ class CmxChannelMap:
     def a4(self):
         return self.get_audio_channel(4)
 
-    @a1.setter
+    @a4.setter
     def a4(self,val):
         self.set_audio_channel(4,val)
 
@@ -157,7 +153,7 @@ def event_list(title, parser):
                 events_result.append(event_t)
 
             raw_event = parser.current_token
-            channels = CmxChannelMap()
+            channels = CmxChannelMap({})
             channels.appendEvent(raw_event.channels)
 
             this_event = {'title': title, 'number': raw_event.event, 'clip_name': None ,
diff --git a/pycmx/parse_cmx_statements.py b/pycmx/parse_cmx_statements.py
index a62f506..0867cd6 100644
--- a/pycmx/parse_cmx_statements.py
+++ b/pycmx/parse_cmx_statements.py
@@ -21,7 +21,7 @@ StmtUnrecognized = namedtuple("Unrecognized",["content"])
 
 
 def parse_cmx3600_statements(path):
-    with open(path,'rU') as file:
+    with open(path,'r') as file:
         lines = file.readlines()
         return [parse_cmx3600_line(line.strip()) for line in lines]
     
diff --git a/tests/.test_parse.py.swp b/tests/.test_parse.py.swp
index a9d31429e6bba67af9e06f1e38f8bf73962d0da3..85ddf83302952501037a8ac429089d3296a7af68 100644
GIT binary patch
delta 270
zcmZojXh;xCG6?hZRj|-AWB>vI28L_znPT*rH;Vn@XO!M7DDat|H<pKi;VBS<WThty
zDuhcN<z--K2jU1I)&Sz?K-p(tRhtzBl6aUE7#JqM)s=`$ElbTSDULRZ)l1Gu%*#v7
zDb`C*Es0MoP07rUhYD$!YicqmKtXY8PMTg~adB!<iCbb$ajFK?1Op@!5)C!Mri){f
sGXl!_=^5#TxCV#lrKaR4DL@QQNljBINi9aRyI2Ecp{CX5=em+i0IY6LeE<Le

delta 69
zcmZojXh;xCG6?hZRj|-AWB>vI28J(hm||iXH;Vn@XB6EmDDat|x15)O;W-e4WJM<n
UDugpV=iRI*P|v&hrLH&=0BCLzfdBvi

diff --git a/tests/test_parse.py b/tests/test_parse.py
index 4d5ce56..8fdfd0d 100644
--- a/tests/test_parse.py
+++ b/tests/test_parse.py
@@ -18,4 +18,10 @@ class TestParse(TestCase):
             events = pycmx.parse_cmx3600(f"tests/edls/{fn}" )
             self.assertTrue( len(events) == count , f"expected {len(events)} but found {count}")
 
+    def test_audio_channels(self):
+        events = pycmx.parse_cmx3600(f"tests/edls/TEST.edl" )
+        self.assertTrue(events[0].channels.a2)
+        self.assertFalse(events[0].channels.a1)
+        self.assertTrue(events[2].channels.get_audio_channel(7))
+