X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=blobdiff_plain;f=aces_1.0.0%2Fpython%2Faces_ocio%2Futilities.py;h=56c9c9d2696f53792797b111828de626d3797b16;hp=75222f18a87e15fc6b805bcca020dad8afafcbdf;hb=54a5731f8ae165da84bbfd8f460359a21433708e;hpb=89360f70a6c71121580324ed3c125a83c3973887 diff --git a/aces_1.0.0/python/aces_ocio/utilities.py b/aces_1.0.0/python/aces_ocio/utilities.py index 75222f1..56c9c9d 100644 --- a/aces_1.0.0/python/aces_ocio/utilities.py +++ b/aces_1.0.0/python/aces_ocio/utilities.py @@ -11,7 +11,7 @@ import os import re from collections import OrderedDict -import PyOpenColorIO as OCIO +import PyOpenColorIO as ocio __author__ = 'ACES Developers' __copyright__ = 'Copyright (C) 2014 - 2015 - ACES Developers' @@ -38,13 +38,13 @@ class ColorSpace(object): name, aliases=[], description=None, - bit_depth=OCIO.Constants.BIT_DEPTH_F32, - equality_group=None, + bit_depth=ocio.Constants.BIT_DEPTH_F32, + equality_group='', family=None, is_data=False, to_reference_transforms=[], from_reference_transforms=[], - allocation_type=OCIO.Constants.ALLOCATION_UNIFORM, + allocation_type=ocio.Constants.ALLOCATION_UNIFORM, allocation_vars=[0, 1]): """ Object description. @@ -61,7 +61,7 @@ class ColorSpace(object): """ self.name = name - self.aliases = [] + self.aliases = aliases self.bit_depth = bit_depth self.description = description self.equality_group = equality_group @@ -147,9 +147,8 @@ def files_walker(directory, filters_in=None, filters_out=None, flags=0): Return value description. """ - for parent_directory, directories, files in os.walk(directory, - topdown=False, - followlinks=True): + for parent_directory, directories, files in os.walk( + directory, topdown=False, followlinks=True): for file in files: path = os.path.join(parent_directory, file) if os.path.isfile(path):