From 07d70535fd63c090b57c754758a0b2ae3ff121ac Mon Sep 17 00:00:00 2001 From: Thomas Mansencal Date: Wed, 29 Jul 2015 22:52:33 +1200 Subject: [PATCH] Fix default mutable arguments. --- aces_1.0.0/python/aces_ocio/aces_config.py | 10 ++++++++-- aces_1.0.0/python/aces_ocio/colorspaces/aces.py | 15 ++++++++++++--- aces_1.0.0/python/aces_ocio/colorspaces/general.py | 15 ++++++++++++--- aces_1.0.0/python/aces_ocio/colorspaces/red.py | 5 ++++- aces_1.0.0/python/aces_ocio/utilities.py | 20 ++++++++++++++++---- 5 files changed, 52 insertions(+), 13 deletions(-) diff --git a/aces_1.0.0/python/aces_ocio/aces_config.py b/aces_1.0.0/python/aces_ocio/aces_config.py index 616c718..7d34157 100755 --- a/aces_1.0.0/python/aces_ocio/aces_config.py +++ b/aces_1.0.0/python/aces_ocio/aces_config.py @@ -548,7 +548,7 @@ def create_config(config_data, aliases=False, prefix=False, multiple_displays=False, - look_info=[], + look_info=None, custom_lut_dir=None): """ Object description. @@ -564,6 +564,9 @@ def create_config(config_data, Return value description. """ + if look_info is None: + look_info = [] + prefixed_names = {} alias_colorspaces = [] @@ -1306,7 +1309,7 @@ def create_ACES_config(aces_ctl_directory, lut_resolution_3d=64, bake_secondary_LUTs=True, multiple_displays=False, - look_info=[], + look_info=None, copy_custom_luts=True, cleanup=True, prefix_colorspaces_with_family_names=True): @@ -1324,6 +1327,9 @@ def create_ACES_config(aces_ctl_directory, Return value description. """ + if look_info is None: + look_info = [] + # Directory for custom LUTs custom_lut_dir = None if copy_custom_luts: diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py index e03b32b..1157b57 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py @@ -464,7 +464,7 @@ def create_generic_log(aces_ctl_directory, lut_resolution_1d, cleanup, name='log', - aliases=[], + aliases=None, min_value=0, max_value=1, input_scale=1, @@ -485,6 +485,9 @@ def create_generic_log(aces_ctl_directory, *Generic Log* colorspace. """ + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -535,10 +538,13 @@ def create_dolbypq(aces_CTL_directory, lut_resolution_1d, cleanup, name='pq', - aliases=[], + aliases=None, min_value=0.0, max_value=1.0, input_scale=1.0): + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -586,13 +592,16 @@ def create_dolbypq_scaled(aces_CTL_directory, lut_resolution_1d, cleanup, name='pq', - aliases=[], + aliases=None, min_value=0.0, max_value=1.0, input_scale=1.0, middle_grey=0.18, min_exposure=-6.0, max_exposure=6.5): + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/general.py b/aces_1.0.0/python/aces_ocio/colorspaces/general.py index 2044804..e708a1d 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/general.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py @@ -33,7 +33,7 @@ __all__ = ['create_matrix_colorspace', def create_matrix_colorspace(name='matrix', from_reference_values=None, to_reference_values=None, - aliases=[]): + aliases=None): """ Object description. @@ -54,6 +54,9 @@ def create_matrix_colorspace(name='matrix', if to_reference_values is None: to_reference_values = [] + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -92,7 +95,7 @@ def create_transfer_colorspace(name='transfer', transfer_function=lambda x: x, lut_directory='/tmp', lut_resolution_1d=1024, - aliases=[]): + aliases=None): """ Object description. @@ -107,6 +110,9 @@ def create_transfer_colorspace(name='transfer', Return value description. """ + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases @@ -159,7 +165,7 @@ def create_matrix_plus_transfer_colorspace(name='matrix_plus_transfer', lut_resolution_1d=1024, from_reference_values=None, to_reference_values=None, - aliases=[]): + aliases=None): """ Object description. @@ -180,6 +186,9 @@ def create_matrix_plus_transfer_colorspace(name='matrix_plus_transfer', if to_reference_values is None: to_reference_values = [] + if aliases is None: + aliases = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.aliases = aliases diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/red.py b/aces_1.0.0/python/aces_ocio/colorspaces/red.py index 3206cd7..cc9df11 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/red.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/red.py @@ -31,7 +31,7 @@ def create_RED_log_film(gamut, name, lut_directory, lut_resolution_1d, - aliases=[]): + aliases=None): """ Object description. @@ -48,6 +48,9 @@ def create_RED_log_film(gamut, Return value description. """ + if aliases is None: + aliases = [] + name = '%s - %s' % (transfer_function, gamut) if transfer_function == '': name = 'Linear - %s' % gamut diff --git a/aces_1.0.0/python/aces_ocio/utilities.py b/aces_1.0.0/python/aces_ocio/utilities.py index 0d3f697..7ba5e5a 100644 --- a/aces_1.0.0/python/aces_ocio/utilities.py +++ b/aces_1.0.0/python/aces_ocio/utilities.py @@ -39,16 +39,16 @@ class ColorSpace(object): def __init__(self, name, - aliases=[], + aliases=None, description=None, bit_depth=ocio.Constants.BIT_DEPTH_F32, equality_group='', family=None, is_data=False, - to_reference_transforms=[], - from_reference_transforms=[], + to_reference_transforms=None, + from_reference_transforms=None, allocation_type=ocio.Constants.ALLOCATION_UNIFORM, - allocation_vars=[0, 1], + allocation_vars=None, aces_transform_id=None): """ Object description. @@ -64,6 +64,18 @@ class ColorSpace(object): Return value description. """ + if aliases is None: + aliases = [] + + if to_reference_transforms is None: + to_reference_transforms = [] + + if from_reference_transforms is None: + from_reference_transforms = [] + + if allocation_vars is None: + allocation_vars = [0, 1] + self.name = name self.aliases = aliases self.bit_depth = bit_depth -- 1.7.10.4