Replaced newline-dependent CMS parser with less breakable regex parser

.travis.yml

@@ -2,17 +2,19 @@ language: python
 python:
   - "2.6"
   - "2.7"
-  - "3.2"
   - "3.3"
   - "3.4"
+  - "3.5"
   - "pypy"
+  - "pypy3"
 # command to install dependencies
 install:
   - pip install argparse
   - pip install mock
   - pip install coveralls
+  - pip install setuptools
 # command to run tests, e.g. python setup.py test
-script: coverage run --source=cdl_convert tests/__init__.py
+script: coverage run --source cdl_convert setup.py test
 # command to run after tests have completed
 after_success:
-  coveralls
+  coveralls

MANIFEST.in

@@ -1,3 +1,4 @@
 include README.rst
 include LICENSE
-recursive-include docs_html *
+include cdl_convert.py
+recursive-include docs_html *

README.rst

@@ -11,7 +11,7 @@ CDL Convert
 - **Docs:** http://cdl-convert.readthedocs.org/
 - **GitHub:** https://github.com/shidarin/cdl_convert
 - **PyPI:** https://pypi.python.org/pypi/cdl_convert
-- **Python Versions:** 2.6-3.4, PyPy
+- **Python Versions:** 2.6-3.5, PyPy & PyPy3
 
 Introduction
 ------------
@@ -40,8 +40,8 @@ It is the purpose of ``cdl_convert`` to convert ASC CDL information between
 these basic formats to further facilitate the ease of exchange of color
 data within the Film and TV industries.
 
-``cdl_convert`` supports parsing ALE, FLEx, CC, CCC, CDL and RCDL. We can write
-out CC, CCC, CDL and RCDL.
+``cdl_convert`` supports parsing ALE, FLEx, CC, CCC, CDL CMX EDL and RCDL.
+We can write out CC, CCC, CDL and RCDL.
 
 **cdl_convert is not associated with the American Society of
 Cinematographers**
@@ -71,6 +71,21 @@ the ``-o`` flag.::
 Changelog
 ---------
 
+*New in version 0.9.2:*
+
+- Fixed a bug where ALE's with blank lines would not convert correctly.
+- Fixed a bug that was preventing ``cdl_convert`` from being correctly installed in Python 2.6
+- Fixed continuous integration testing.
+- No longer officially supporting Python 3.2, as I've had to remove it from our CI builds. It should still work just fine though, but we won't be running CI against it.
+
+*New in version 0.9:*
+
+- Added ability to parse CMX EDLs
+- Fixed a script bug where a collection format containing color decisions will not have those color decisions exported as individual color corrections.
+- Fixed a bug where we weren't reading line endings correctly in certain situations.
+- Added a cdl_convert.py stub file to the package root level, which will allow running of the cdl_convert script without installation. Due to relative imports in the python code, it was no longer possible to call cdl_convert/cdl_convert.py directly.
+- The script, when run directly from cdl_convert.py, will now write errors to stderror correctly, and exit with a status of 1.
+
 *New in version 0.8:*
 
 - Added ``--single`` flag. When provided with an output collection format, each color correction in the input will be exported to it's own collection.

cdl_convert.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+"""
+
+CDL Convert
+=======================
+
+Stub file for script execution of cdl_convert without installing.
+
+## License
+
+The MIT License (MIT)
+
+cdl_convert
+Copyright (c) 2015 Sean Wallitsch
+http://github.com/shidarin/cdl_convert/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+"""
+
+# ==============================================================================
+# IMPORTS
+# ==============================================================================
+
+from __future__ import print_function
+
+# Standard Imports
+
+import sys
+
+# cdl_convert imports
+
+from cdl_convert.cdl_convert import main
+
+# ==============================================================================
+# PRIVATE FUNCTIONS
+# ==============================================================================
+
+
+def _print_error(*objs):
+    print(*objs, file=sys.stderr)
+
+# ==============================================================================
+# EXECUTION
+# ==============================================================================
+
+if __name__ == '__main__':  # pragma: no cover
+    try:
+        main()
+    except Exception as err:  # pylint: disable=W0703
+        import traceback
+        _print_error('Unexpected error encountered:')
+        _print_error(err)
+        _print_error(traceback.format_exc())
+        exit(1)

cdl_convert/__init__.py

@@ -94,7 +94,7 @@
 __copyright__ = "Copyright 2015, Sean Wallitsch"
 __credits__ = ["Sean Wallitsch", ]
 __license__ = "MIT"
-__version__ = "0.8"
+__version__ = "0.9.2"
 __maintainer__ = "Sean Wallitsch"
 __email__ = "shidarin@alphamatte.com"
 __status__ = "Development"

cdl_convert/cdl_convert.py

@@ -251,6 +251,9 @@ def write_collection_file(col, ext):
             if filetype_in in config.COLLECTION_FORMATS:
                 for color_correct in color_decisions.color_corrections:
                     sanity_check(color_correct)
+                for decision in color_decisions.color_decisions:
+                    if not decision.is_ref:
+                        sanity_check(decision.cc)
             else:
                 sanity_check(color_decisions)
 
@@ -260,6 +263,9 @@ def write_collection_file(col, ext):
                 if filetype_in in config.COLLECTION_FORMATS:
                     for color_correct in color_decisions.color_corrections:
                         write_single_file(color_correct, ext)
+                    for decision in color_decisions.color_decisions:
+                        if not decision.is_ref:
+                            write_single_file(decision.cc, ext)
                 else:
                     write_single_file(color_decisions, ext)
             else:
@@ -279,13 +285,3 @@ def write_collection_file(col, ext):
                     collection = ColorCollection(input_file=filepath)
                     collection.append_child(color_decisions)
                     write_collection_file(collection, ext)
-
-if __name__ == '__main__':  # pragma: no cover
-    try:
-        main()
-    except Exception as err:  # pylint: disable=W0703
-        import traceback
-        print('Unexpected error encountered:')
-        print(err)
-        print(traceback.format_exc())
-        raw_input('Press enter key to exit')

cdl_convert/config.py

@@ -72,6 +72,7 @@
 #       id doesn't exist. (Other than first creation)
 #   If a ColorCorrection is given a duplicate ID
 HALT_ON_ERROR = False
+MISSING_ID_FROM_DESC_IF_AVAILABLE = True
 
 COLLECTION_FORMATS = ['ale', 'ccc', 'cdl', 'edl', 'flex']
 SINGLE_FORMATS = ['cc', 'rcdl']

cdl_convert/correction.py

@@ -537,7 +537,7 @@ def sat(self, value):
 
     def build_element(self):
         """Builds an ElementTree XML Element representing this SatNode"""
-        sat = ElementTree.Element('SATNode')
+        sat = ElementTree.Element('SatNode')
         for description in self.desc:
             desc = ElementTree.SubElement(sat, 'Description')
             desc.text = description