From 348962c3f72d53cbc9aa3e1b40e127f73b515e52 Mon Sep 17 00:00:00 2001 From: Jamie Hardt Date: Sat, 29 Dec 2018 12:53:08 -0800 Subject: [PATCH] Code Style/Blank lines --- pycmx/parse_cmx_events.py | 1 + pycmx/parse_cmx_statements.py | 2 +- pycmx/transition.py | 8 +------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pycmx/parse_cmx_events.py b/pycmx/parse_cmx_events.py index c193449..e9c10d2 100644 --- a/pycmx/parse_cmx_events.py +++ b/pycmx/parse_cmx_events.py @@ -2,6 +2,7 @@ # (c) 2018 Jamie Hardt from collections import namedtuple + from .parse_cmx_statements import (parse_cmx3600_statements, StmtEvent,StmtFCM ) from .edit_list import EditList diff --git a/pycmx/parse_cmx_statements.py b/pycmx/parse_cmx_statements.py index b7de657..ee4386d 100644 --- a/pycmx/parse_cmx_statements.py +++ b/pycmx/parse_cmx_statements.py @@ -1,12 +1,12 @@ # pycmx # (c) 2018 Jamie Hardt -from .util import collimate import re import sys from collections import namedtuple from itertools import count +from .util import collimate StmtTitle = namedtuple("Title",["title","line_number"]) StmtFCM = namedtuple("FCM",["drop","line_number"]) diff --git a/pycmx/transition.py b/pycmx/transition.py index d748717..714cd09 100644 --- a/pycmx/transition.py +++ b/pycmx/transition.py @@ -1,12 +1,11 @@ # pycmx # (c) 2018 Jamie Hardt - class Transition: """ A CMX transition: a wipe, dissolve or cut. """ - + Cut = "C" Dissolve = "D" Wipe = "W" @@ -14,12 +13,9 @@ class Transition: Key = "K" KeyOut = "KO" - def __init__(self, transition, operand): self.transition = transition self.operand = operand - self.name = '' - @property def kind(self): @@ -49,13 +45,11 @@ class Transition: "`True` if this traansition is a dissolve." return self.transition == 'D' - @property def wipe(self): "`True` if this transition is a wipe." return self.transition.startswith('W') - @property def effect_duration(self): """The duration of this transition, in frames of the record target.