From 966f8c1ca46b2945a8cac41f8e34e1c796273148 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 1 Dec 2018 12:46:10 -0800 Subject: [PATCH] Fixed another audio channel parsing bug --- pycmx/parse_cmx.py | 8 ++------ tests/.test_parse.py.swp | Bin 12288 -> 0 bytes 2 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 tests/.test_parse.py.swp diff --git a/pycmx/parse_cmx.py b/pycmx/parse_cmx.py index c856ace..40e44d3 100644 --- a/pycmx/parse_cmx.py +++ b/pycmx/parse_cmx.py @@ -117,11 +117,7 @@ class CmxChannelMap: self.a4 = ext.audio4 def __repr__(self): - return "CmxChannelMap(v="+ self.v.__repr__( ) + \ - ",a1=" + self.a1.__repr__() + \ - ",a2=" + self.a2.__repr__() + \ - ",a3=" + self.a3.__repr__() + \ - ",a4=" + self.a4.__repr__() +")" + return f"CmxChannelMap(v={self.v}, audio_channels={self._audio_channel_set})" def parse_cmx3600(file): @@ -153,7 +149,7 @@ def event_list(title, parser): events_result.append(event_t) raw_event = parser.current_token - channels = CmxChannelMap({}) + channels = CmxChannelMap(v=False, audio_channels=set([])) channels.appendEvent(raw_event.channels) this_event = {'title': title, 'number': raw_event.event, 'clip_name': None , diff --git a/tests/.test_parse.py.swp b/tests/.test_parse.py.swp deleted file mode 100644 index 85ddf83302952501037a8ac429089d3296a7af68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2%Wl&^6ow~dO98VLi0xUS=IG2`ILS0emjP!e)nSail`DQj&X5Cy_yble-VpuLP z_W9S$x9Sqo=pOlMe3H5ZMVBsmRv}Y zJ?+Fv1virI<3msn5g-C5A<&cl^~Nl#RxDEuzouP>Y5g-CYfCvx)B0vO)01-Ha1RRgC zwX=+UMXCS)N8kTn&NH@$`h@z3dXL&gy+-v>OQ_4J-{%Pa!u-nFtU8B0vO)01+SpM1Tkof&Y^LFa~)MJoF7m2%bv3 zwaj(i=aCevl{LfNaH5EZ!g#`^?ex4Lw(};vUMwCJ;ITQSRJocMN>fU^v?2KB(@4xeHybxOihiK!G?+ z0YV<-D2mW*f*bcD2_^6~zLjuSau0T)>vl4$M|K` zFzFh#0BB>Xf7w-MeA8~#?0XLu?p6)UHml~m)v#9rkH^_gl#UwI?kq#gg1*_P%vtqA zzHDJCdu?&4U9(#l)G}+i4TkZ?8>_Z`yq#`{rx-f8;mhjMysq9B9KjWxpqs?093COY S{50-DFAAhO9gz2p?CcLaS01zg