From: Thomas Mansencal Date: Tue, 28 Jul 2015 08:53:04 +0000 (+1200) Subject: Change double quotes to single quotes where relevant. X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=7a22772bdc32ebbbdc8ea394ff1b94d00eb55645 Change double quotes to single quotes where relevant. --- 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 225c1d6..42b2409 100755 --- a/aces_1.0.0/python/aces_ocio/aces_config.py +++ b/aces_1.0.0/python/aces_ocio/aces_config.py @@ -118,15 +118,15 @@ def set_config_default_roles(config, # 'rendering' and 'compositing_linear' roles default to the 'scene_linear' # value if not set explicitly if rendering: - config.setRole("rendering", rendering) + config.setRole('rendering', rendering) if compositing_linear: - config.setRole("compositing_linear", compositing_linear) + config.setRole('compositing_linear', compositing_linear) if scene_linear: config.setRole(ocio.Constants.ROLE_SCENE_LINEAR, scene_linear) if not rendering: - config.setRole("rendering", scene_linear) + config.setRole('rendering', scene_linear) if not compositing_linear: - config.setRole("compositing_linear", scene_linear) + config.setRole('compositing_linear', scene_linear) return True @@ -282,7 +282,7 @@ def generate_OCIO_transform(transforms): # unknown type else: - print("Ignoring unknown transform type : %s" % transform['type']) + print('Ignoring unknown transform type : %s' % transform['type']) if len(ocio_transforms) > 1: group_transform = ocio.GroupTransform() @@ -328,7 +328,7 @@ def add_colorspace_aliases(config, description = colorspace.description if colorspace.aces_transform_id: - description += "\n\nACES Transform ID : %s" % colorspace.aces_transform_id + description += '\n\nACES Transform ID : %s' % colorspace.aces_transform_id ocio_colorspace_alias = ocio.ColorSpace( name=alias_name, @@ -388,18 +388,18 @@ def add_look(config, look_name, look_colorspace, look_lut, look_cccid = unpack_default(look, 4) - print('Adding look %s - %s' % (look_name, ", ".join(look))) + print('Adding look %s - %s' % (look_name, ', '.join(look))) # # Copy look lut # if custom_lut_dir: if not '$' in look_lut: - print("Getting ready to copy look lut : %s" % look_lut) + print('Getting ready to copy look lut : %s' % look_lut) shutil.copy2(look_lut, custom_lut_dir) look_lut = os.path.split(look_lut)[1] else: - print("Skipping LUT copy because path contains a context variable") + print('Skipping LUT copy because path contains a context variable') # # Create OCIO Look @@ -422,17 +422,17 @@ def add_look(config, # add to config config.addLook(lk1) - print("Creating aliased colorspace") + print('Creating aliased colorspace') # # Create OCIO colorspace that references that look # - Needed for some implementations that don't process looks well # - Also needed for some implementations that don't expose looks well # - look_aliases = ["look_%s" % compact(look_name)] + look_aliases = ['look_%s' % compact(look_name)] colorspace = ColorSpace(look_name, aliases=look_aliases, - description="The %s Look colorspace" % look_name, + description='The %s Look colorspace' % look_name, family='Look') colorspace.from_reference_transforms = [{'type': 'look', @@ -447,7 +447,7 @@ def add_look(config, # Add this colorspace into the main list of colorspaces config_data['colorSpaces'].append(colorspace) - print("") + print('') def integrate_looks_into_views(config, @@ -484,11 +484,11 @@ def integrate_looks_into_views(config, else: for display, view_list in config_data['displays'].iteritems(): output_colorspace_copy = None - look_names_string = "" + look_names_string = '' for view_name, output_colorspace in view_list.iteritems(): - if view_name == "Output Transform": + if view_name == 'Output Transform': - print("Adding new View that incorporates looks") + print('Adding new View that incorporates looks') # Make a copy of the output colorspace output_colorspace_copy = copy.deepcopy(output_colorspace) @@ -521,27 +521,27 @@ def integrate_looks_into_views(config, if not look_name in config_data['looks']: config_data['looks'].append(look_name) - look_names_string = ", ".join(look_names) - output_colorspace_copy.name = "%s with %s" % ( + look_names_string = ', '.join(look_names) + output_colorspace_copy.name = '%s with %s' % ( output_colorspace.name, look_names_string) output_colorspace_copy.aliases = [ - "out_%s" % compact(output_colorspace_copy.name)] + 'out_%s' % compact(output_colorspace_copy.name)] print( - "Colorspace that incorporates looks created : %s" % output_colorspace_copy.name) + 'Colorspace that incorporates looks created : %s' % output_colorspace_copy.name) config_data['colorSpaces'].append(output_colorspace_copy) if output_colorspace_copy: print( - "Adding colorspace that incorporates looks into view list") + 'Adding colorspace that incorporates looks into view list') # Change the name of the View view_list[ - "Output Transform with %s" % look_names_string] = output_colorspace_copy + 'Output Transform with %s' % look_names_string] = output_colorspace_copy config_data['displays'][display] = view_list - # print( "Display : %s, View List : %s" % (display, ", ".join(view_list)) ) + # print( 'Display : %s, View List : %s' % (display, ', '.join(view_list)) ) def create_config(config_data, @@ -612,9 +612,9 @@ def create_config(config_data, alias_colorspaces.append( [reference_data, reference_data, reference_data.aliases]) - print("") + print('') - # print( "color spaces : %s" % [x.name for x in sorted(config_data['colorSpaces'])]) + # print( 'color spaces : %s' % [x.name for x in sorted(config_data['colorSpaces'])]) # # Add Looks and Look colorspaces @@ -640,7 +640,7 @@ def create_config(config_data, config_data, multiple_displays) - print("") + print('') print('Adding the regular color spaces') @@ -657,7 +657,7 @@ def create_config(config_data, description = colorspace.description if colorspace.aces_transform_id: - description += "\n\nACES Transform ID : %s" % colorspace.aces_transform_id + description += '\n\nACES Transform ID : %s' % colorspace.aces_transform_id ocio_colorspace = ocio.ColorSpace( name=colorspace.name, @@ -700,7 +700,7 @@ def create_config(config_data, print('') - print("") + print('') # # We add roles early so we can create alias colorspaces with the names of the roles @@ -725,12 +725,12 @@ def create_config(config_data, config_data['roles']['texture_paint']]) # Not allowed for the moment. role names can not overlap with colorspace names. - ''' + """ # Add the aliased colorspaces for each role for role_name, role_colorspace_name in config_data['roles'].iteritems(): role_colorspace_prefixed_name = prefixed_names[role_colorspace_name] - print( "Finding colorspace : %s" % role_colorspace_prefixed_name ) + print( 'Finding colorspace : %s' % role_colorspace_prefixed_name ) # Find the colorspace pointed to by the role role_colorspaces = [colorspace for colorspace in config_data['colorSpaces'] if colorspace.name == role_colorspace_prefixed_name] role_colorspace = None @@ -741,11 +741,11 @@ def create_config(config_data, role_colorspace = reference_data if role_colorspace: - print( "Adding an alias colorspace named %s, pointing to %s" % ( + print( 'Adding an alias colorspace named %s, pointing to %s' % ( role_name, role_colorspace.name)) add_colorspace_aliases(config, reference_data, role_colorspace, [role_name], 'Roles') - ''' + """ else: set_config_default_roles( @@ -761,7 +761,7 @@ def create_config(config_data, texture_paint=config_data['roles']['texture_paint']) # Not allowed for the moment. role names can not overlap with colorspace names. - ''' + """ # Add the aliased colorspaces for each role for role_name, role_colorspace_name in config_data['roles'].iteritems(): # Find the colorspace pointed to by the role @@ -774,13 +774,13 @@ def create_config(config_data, role_colorspace = reference_data if role_colorspace: - print( "Adding an alias colorspace named %s, pointing to %s" % ( + print( 'Adding an alias colorspace named %s, pointing to %s' % ( role_name, role_colorspace.name)) add_colorspace_aliases(config, reference_data, role_colorspace, [role_name], 'Roles') - ''' + """ - print("") + print('') # We add these at the end as some applications use the order of the colorspaces # definitions in the config to order the colorspaces in their selection lists. @@ -790,7 +790,7 @@ def create_config(config_data, for reference, colorspace, aliases in alias_colorspaces: add_colorspace_aliases(config, reference, colorspace, aliases) - print("") + print('') print('Adding the diplays and views') @@ -811,8 +811,8 @@ def create_config(config_data, if multiple_displays: # Built list of looks to add to Displays looks = config_data['looks'] if ('looks' in config_data) else [] - looks = ", ".join(looks) - print("Creating multiple displays, with looks : %s" % looks) + looks = ', '.join(looks) + print('Creating multiple displays, with looks : %s' % looks) # Note: We don't reorder the Displays to put the 'defaultDisplay' first # because OCIO will order them alphabetically when the config is written to disk. @@ -821,12 +821,12 @@ def create_config(config_data, for display, view_list in config_data['displays'].iteritems(): for view_name, colorspace in view_list.iteritems(): config.addDisplay(display, view_name, colorspace.name, looks) - if 'Output Transform' in view_name and looks != "": + if 'Output Transform' in view_name and looks != '': # Add normal View, without looks config.addDisplay(display, view_name, colorspace.name) # Add View with looks - view_name_with_looks = "%s with %s" % (view_name, looks) + view_name_with_looks = '%s with %s' % (view_name, looks) config.addDisplay(display, view_name_with_looks, colorspace.name, looks) else: @@ -848,7 +848,7 @@ def create_config(config_data, # Built list of looks to add to Displays looks = config_data['looks'] if ('looks' in config_data) else [] - look_names = ", ".join(looks) + look_names = ', '.join(looks) displays_views_colorspaces = [] @@ -857,7 +857,7 @@ def create_config(config_data, view_list = config_data['displays'][display] for view_name, colorspace in view_list.iteritems(): if 'Output Transform' in view_name: - # print( "Adding view for %s" % colorspace.name ) + # print( 'Adding view for %s' % colorspace.name ) # We use the Display names as the View names in this case # as there is a single Display that contains all views. @@ -869,7 +869,7 @@ def create_config(config_data, # If View includes looks if 'with' in view_name: # Integrate looks into view name - display_cleaned = "%s with %s" % ( + display_cleaned = '%s with %s' % ( display_cleaned, look_names) viewsWithLooksAtEnd = False @@ -934,7 +934,7 @@ def create_config(config_data, config.setActiveDisplays(','.join(sorted(displays))) config.setActiveViews(','.join(views)) - print("") + print('') # Make sure we didn't create a bad config config.sanityCheck() @@ -954,15 +954,15 @@ def create_config(config_data, for colorspace in config_data['colorSpaces']: colorspace.name = prefixed_names_inverse[colorspace.name] except: - print("Prefixed names") + print('Prefixed names') for original, prefixed in prefixed_names.iteritems(): - print("%s, %s" % (original, prefixed)) + print('%s, %s' % (original, prefixed)) - print("\n") + print('\n') - print("Inverse Lookup of Prefixed names") + print('Inverse Lookup of Prefixed names') for prefixed, original in prefixed_names_inverse.iteritems(): - print("%s, %s" % (prefixed, original)) + print('%s, %s' % (prefixed, original)) raise return config @@ -1118,7 +1118,7 @@ def generate_baked_LUTs(odt_info, # Uncomment if you would like to support the older behavior where ODTs # that have support for full and legal range output generate a LUT for each. - ''' + """ # Create two entries for ODTs that have full and legal range support for odt_ctl_name, odt_values in odt_info.iteritems(): if odt_values['transformHasFullLegalSwitch']: @@ -1133,7 +1133,7 @@ def generate_baked_LUTs(odt_info, odt_info_C['%s - Full' % odt_ctl_name] = odt_values_full del (odt_info_C[odt_ctl_name]) - ''' + """ # Generate appropriate LUTs for each ODT for odt_ctl_name, odt_values in odt_info_C.iteritems(): @@ -1145,8 +1145,8 @@ def generate_baked_LUTs(odt_info, args = ['--iconfig', config_path, '-v'] if prefix: - args += ['--inputspace', "ACES - %s" % input_space] - args += ['--outputspace', "Output - %s" % odt_name] + args += ['--inputspace', 'ACES - %s' % input_space] + args += ['--outputspace', 'Output - %s' % odt_name] else: args += ['--inputspace', input_space] args += ['--outputspace', odt_name] @@ -1156,7 +1156,7 @@ def generate_baked_LUTs(odt_info, odt_name, input_space)] if prefix: - args += ['--shaperspace', "Utility - %s" % shaper_name, + args += ['--shaperspace', 'Utility - %s' % shaper_name, '--shapersize', str(lut_resolution_shaper)] else: args += ['--shaperspace', shaper_name, @@ -1178,8 +1178,8 @@ def generate_baked_LUTs(odt_info, args = ['--iconfig', config_path, '-v'] if prefix: - args += ['--inputspace', "ACES - %s" % input_space] - args += ['--outputspace', "Output - %s" % odt_name] + args += ['--inputspace', 'ACES - %s' % input_space] + args += ['--outputspace', 'Output - %s' % odt_name] else: args += ['--inputspace', input_space] args += ['--outputspace', odt_name] @@ -1187,7 +1187,7 @@ def generate_baked_LUTs(odt_info, '%s - %s for %s data' % ( odt_prefix, odt_name, input_space)] if prefix: - args += ['--shaperspace', "Utility - %s" % shaper_name, + args += ['--shaperspace', 'Utility - %s' % shaper_name, '--shapersize', str(lut_resolution_shaper)] else: args += ['--shaperspace', shaper_name, @@ -1221,8 +1221,8 @@ def generate_baked_LUTs(odt_info, args = ['--iconfig', config_path, '-v'] if prefix: - args += ['--inputspace', "ACES - %s" % input_space] - args += ['--outputspace', "Output - %s" % odt_name] + args += ['--inputspace', 'ACES - %s' % input_space] + args += ['--outputspace', 'Output - %s' % odt_name] else: args += ['--inputspace', input_space] args += ['--outputspace', odt_name] @@ -1230,11 +1230,11 @@ def generate_baked_LUTs(odt_info, '%s - %s for %s data' % ( odt_prefix, odt_name, input_space)] if input_space == 'ACEScg': - lin_shaper_name = "%s - AP1" % shaper_name + lin_shaper_name = '%s - AP1' % shaper_name else: lin_shaper_name = shaper_name if prefix: - lin_shaper_name = "Utility - %s" % lin_shaper_name + lin_shaper_name = 'Utility - %s' % lin_shaper_name args += ['--shaperspace', lin_shaper_name, '--shapersize', str(lut_resolution_shaper)] @@ -1327,7 +1327,7 @@ def create_ACES_config(aces_ctl_directory, # Directory for custom LUTs custom_lut_dir = None if copy_custom_luts: - custom_lut_dir = os.path.join(config_directory, "custom") + custom_lut_dir = os.path.join(config_directory, 'custom') lut_directory = create_config_dir(config_directory, bake_secondary_LUTs, @@ -1423,16 +1423,16 @@ def main(): look_info = [] def look_info_callback(option, opt_str, value, parser): - print("look_info_callback") + print('look_info_callback') print(option, opt_str, value, parser) - if opt_str == "--addCustomLookCDL": + if opt_str == '--addCustomLookCDL': look_info.append(value) - elif opt_str == "--addCustomLookLUT": + elif opt_str == '--addCustomLookLUT': look_info.append(value) - elif opt_str == "--addACESLookCDL": - look_info.append([value[0], "ACES - ACEScc", value[1], value[2]]) - elif opt_str == "--addACESLookLUT": - look_info.append([value[0], "ACES - ACEScc", value[1]]) + elif opt_str == '--addACESLookCDL': + look_info.append([value[0], 'ACES - ACEScc', value[1], value[2]]) + elif opt_str == '--addACESLookLUT': + look_info.append([value[0], 'ACES - ACEScc', value[1]]) p = optparse.OptionParser(description='', prog='create_aces_config', @@ -1451,13 +1451,13 @@ def main(): default=False) p.add_option('--addCustomLookLUT', '', type='string', nargs=3, - action="callback", callback=look_info_callback) + action='callback', callback=look_info_callback) p.add_option('--addCustomLookCDL', '', type='string', nargs=4, - action="callback", callback=look_info_callback) + action='callback', callback=look_info_callback) p.add_option('--addACESLookLUT', '', type='string', nargs=2, - action="callback", callback=look_info_callback) + action='callback', callback=look_info_callback) p.add_option('--addACESLookCDL', '', type='string', nargs=3, - action="callback", callback=look_info_callback) + action='callback', callback=look_info_callback) p.add_option('--copyCustomLUTs', action='store_true', default=False) options, arguments = p.parse_args() 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 531d02b..e03b32b 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/aces.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/aces.py @@ -91,7 +91,7 @@ def create_ACES(): aces2065_1.description = ( 'The Academy Color Encoding System reference color space') aces2065_1.equality_group = '' - aces2065_1.aliases = ["lin_ap0", "aces"] + aces2065_1.aliases = ['lin_ap0', 'aces'] aces2065_1.family = 'ACES' aces2065_1.is_data = False aces2065_1.allocation_type = ocio.Constants.ALLOCATION_LG2 @@ -124,13 +124,13 @@ def create_ACEScc(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acescc", "acescc_ap1"] + cs.aliases = ['acescc', 'acescc_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False cs.allocation_type = ocio.Constants.ALLOCATION_UNIFORM cs.allocation_vars = [min_value, max_value] - cs.aces_transform_id = "ACEScsc.ACEScc_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACEScc_to_ACES.a1.0.0' ctls = [os.path.join(aces_ctl_directory, 'ACEScc', @@ -197,12 +197,12 @@ def create_ACESproxy(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acesproxy", "acesproxy_ap1"] + cs.aliases = ['acesproxy', 'acesproxy_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False - cs.aces_transform_id = "ACEScsc.ACESproxy10i_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACESproxy10i_to_ACES.a1.0.0' ctls = [os.path.join(aces_ctl_directory, 'ACESproxy', @@ -272,14 +272,14 @@ def create_ACEScg(aces_ctl_directory, cs = ColorSpace(name) cs.description = 'The %s color space' % name - cs.aliases = ["acescg", "lin_ap1"] + cs.aliases = ['acescg', 'lin_ap1'] cs.equality_group = '' cs.family = 'ACES' cs.is_data = False cs.allocation_type = ocio.Constants.ALLOCATION_LG2 cs.allocation_vars = [-8, 5, 0.00390625] - cs.aces_transform_id = "ACEScsc.ACEScg_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ACEScg_to_ACES.a1.0.0' cs.to_reference_transforms = [] @@ -324,13 +324,13 @@ def create_ADX(lut_directory, name = '%s%s' % (name, bit_depth) cs = ColorSpace(name) cs.description = '%s color space - used for film scans' % name - cs.aliases = ["adx%s" % str(bit_depth)] + cs.aliases = ['adx%s' % str(bit_depth)] cs.equality_group = '' cs.family = 'ADX' cs.is_data = False if bit_depth == 10: - cs.aces_transform_id = "ACEScsc.ADX10_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ADX10_to_ACES.a1.0.0' cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT10 ADX_to_CDD = [1023 / 500, 0, 0, 0, @@ -339,7 +339,7 @@ def create_ADX(lut_directory, 0, 0, 0, 1] offset = [-95 / 500, -95 / 500, -95 / 500, 0] elif bit_depth == 16: - cs.aces_transform_id = "ACEScsc.ADX16_to_ACES.a1.0.0" + cs.aces_transform_id = 'ACEScsc.ADX16_to_ACES.a1.0.0' cs.bit_depth = ocio.Constants.BIT_DEPTH_UINT16 ADX_to_CDD = [65535 / 8000, 0, 0, 0, @@ -828,7 +828,7 @@ def create_LMTs(aces_ctl_directory, print(sorted_LMTs) for lmt in sorted_LMTs: lmt_name, lmt_values = lmt - lmt_aliases = ["look_%s" % compact(lmt_values['transformUserName'])] + lmt_aliases = ['look_%s' % compact(lmt_values['transformUserName'])] cs = create_ACES_LMT( lmt_values['transformUserName'], lmt_values, @@ -1045,7 +1045,7 @@ def create_ODTs(aces_ctl_directory, # Defining the *Log 2* shaper. log2_shaper_name = shaper_name - log2_shaper_name_aliases = ["crv_%s" % compact(log2_shaper_name)] + log2_shaper_name_aliases = ['crv_%s' % compact(log2_shaper_name)] log2_params = { 'middleGrey': 0.18, 'minExposure': -6, @@ -1080,11 +1080,11 @@ def create_ODTs(aces_ctl_directory, shaper_data[log2_shaper_name] = log2_shaper_data # Space with a more user-friendly name. Direct copy otherwise. - log2_shaper_copy_name = "Log2 Shaper" + log2_shaper_copy_name = 'Log2 Shaper' log2_shaper_copy_colorspace = ColorSpace(log2_shaper_copy_name) log2_shaper_copy_colorspace.description = 'The %s color space' % log2_shaper_copy_name log2_shaper_copy_colorspace.aliases = [ - "crv_%s" % compact(log2_shaper_copy_name)] + 'crv_%s' % compact(log2_shaper_copy_name)] log2_shaper_copy_colorspace.equality_group = log2_shaper_copy_name log2_shaper_copy_colorspace.family = log2_shaper_colorspace.family log2_shaper_copy_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1095,11 +1095,11 @@ def create_ODTs(aces_ctl_directory, colorspaces.append(log2_shaper_copy_colorspace) # Defining the *Log2 shaper that includes the AP1* primaries. - log2_shaper_api1_name = "%s - AP1" % "Log2 Shaper" + log2_shaper_api1_name = '%s - AP1' % 'Log2 Shaper' log2_shaper_api1_colorspace = ColorSpace(log2_shaper_api1_name) log2_shaper_api1_colorspace.description = 'The %s color space' % log2_shaper_api1_name log2_shaper_api1_colorspace.aliases = [ - "%s_ap1" % compact(log2_shaper_copy_name)] + '%s_ap1' % compact(log2_shaper_copy_name)] log2_shaper_api1_colorspace.equality_group = log2_shaper_api1_name log2_shaper_api1_colorspace.family = log2_shaper_colorspace.family log2_shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1118,10 +1118,10 @@ def create_ODTs(aces_ctl_directory, # Defining the *Log2 shaper that includes the AP1* primaries. # Named with 'shaper_name' variable. Needed for some LUT baking steps. - shaper_api1_name = "%s - AP1" % shaper_name + shaper_api1_name = '%s - AP1' % shaper_name shaper_api1_colorspace = ColorSpace(shaper_api1_name) shaper_api1_colorspace.description = 'The %s color space' % shaper_api1_name - shaper_api1_colorspace.aliases = ["%s_ap1" % compact(shaper_name)] + shaper_api1_colorspace.aliases = ['%s_ap1' % compact(shaper_name)] shaper_api1_colorspace.equality_group = shaper_api1_name shaper_api1_colorspace.family = log2_shaper_colorspace.family shaper_api1_colorspace.is_data = log2_shaper_colorspace.is_data @@ -1133,8 +1133,8 @@ def create_ODTs(aces_ctl_directory, # Define the base *Dolby PQ Shaper* # - dolbypq_shaper_name = "Dolby PQ 10000" - dolbypq_shaper_name_aliases = ["crv_%s" % "dolbypq_10000"] + dolbypq_shaper_name = 'Dolby PQ 10000' + dolbypq_shaper_name_aliases = ['crv_%s' % 'dolbypq_10000'] dolbypq_shaper_colorspace = create_dolbypq( aces_ctl_directory, @@ -1161,8 +1161,8 @@ def create_ODTs(aces_ctl_directory, # Define the *Dolby PQ Shaper that considers a fixed linear range* # - dolbypq_scaled_shaper_name = "Dolby PQ Scaled" - dolbypq_scaled_shaper_name_aliases = ["crv_%s" % "dolbypq_scaled"] + dolbypq_scaled_shaper_name = 'Dolby PQ Scaled' + dolbypq_scaled_shaper_name_aliases = ['crv_%s' % 'dolbypq_scaled'] dolbypq_scaled_shaper_colorspace = create_dolbypq_scaled( aces_ctl_directory, @@ -1214,7 +1214,7 @@ def create_ODTs(aces_ctl_directory, odt_legal = odt_values.copy() - odt_aliases = ["out_%s" % compact(odt_name_legal)] + odt_aliases = ['out_%s' % compact(odt_name_legal)] cs = create_ACES_RRT_plus_ODT( odt_name_legal, @@ -1233,7 +1233,7 @@ def create_ODTs(aces_ctl_directory, 'Log': log_display_space, 'Output Transform': cs} - ''' + """ # Generating full range transform for *ODTs* that can generate # either *legal* or *full* output. if odt_values['transformHasFullLegalSwitch']: @@ -1243,7 +1243,7 @@ def create_ODTs(aces_ctl_directory, odt_full = odt_values.copy() odt_full['legalRange'] = 0 - odt_full_aliases = ["out_%s" % compact(odt_name_full)] + odt_full_aliases = ['out_%s' % compact(odt_name_full)] cs_full = create_ACES_RRT_plus_ODT( odt_name_full, @@ -1261,7 +1261,7 @@ def create_ODTs(aces_ctl_directory, 'Raw': linear_display_space, 'Log': log_display_space, 'Output Transform': cs_full} - ''' + """ return (colorspaces, displays) @@ -1294,8 +1294,8 @@ def get_transform_info(ctl_transform): # Figuring out if this transform has options for processing full and legal range transform_full_legal_switch = False for line in lines: - if line.strip() == "input varying int legalRange = 0": - # print( "%s has legal range flag" % transform_user_name) + if line.strip() == 'input varying int legalRange = 0': + # print( '%s has legal range flag' % transform_user_name) transform_full_legal_switch = True break @@ -1546,7 +1546,7 @@ def create_colorspaces(aces_ctl_directory, colorspaces.extend(odts) # Wish there was an automatic way to get this from the CTL - defaultDisplay = "sRGB (D60 sim.)" + defaultDisplay = 'sRGB (D60 sim.)' roles = {'color_picking': ACEScg.name, 'color_timing': ACEScc.name, diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py index 2baf2e3..22a875a 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/arri.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/arri.py @@ -64,7 +64,7 @@ def create_log_c(gamut, cs.is_data = False if gamut and transfer_function: - cs.aces_transform_id = "IDT.ARRI.Alexa-v3-logC-EI%s.a1.v1" % exposure_index + cs.aces_transform_id = 'IDT.ARRI.Alexa-v3-logC-EI%s.a1.v1' % exposure_index # A linear space needs allocation variables if transfer_function == '': @@ -204,7 +204,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'LogC', lut_directory, lut_resolution_1d, - ["%sei%s_%s" % ("logc3", str(EI), "arriwide")]) + ['%sei%s_%s' % ('logc3', str(EI), 'arriwide')]) colorspaces.append(log_c_EI_full) # Linearization Only @@ -216,7 +216,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'LogC', lut_directory, lut_resolution_1d, - ["crv_%sei%s" % ("logc3", str(EI))]) + ['crv_%sei%s' % ('logc3', str(EI))]) colorspaces.append(log_c_EI_linearization) # Primaries Only @@ -227,7 +227,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'LogC', lut_directory, lut_resolution_1d, - ["%s_%s" % ('lin', "arriwide")]) + ['%s_%s' % ('lin', 'arriwide')]) colorspaces.append(log_c_EI_primaries) return colorspaces diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py index 2be9690..e19f714 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/canon.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/canon.py @@ -180,7 +180,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_rec709day"]) + ['canonlog_rec709day']) colorspaces.append(c_log_1) c_log_2 = create_c_log( @@ -189,7 +189,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_rec709tung"]) + ['canonlog_rec709tung']) colorspaces.append(c_log_2) c_log_3 = create_c_log( @@ -198,7 +198,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_dcip3day"]) + ['canonlog_dcip3day']) colorspaces.append(c_log_3) c_log_4 = create_c_log( @@ -207,7 +207,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_dcip3tung"]) + ['canonlog_dcip3tung']) colorspaces.append(c_log_4) c_log_5 = create_c_log( @@ -216,7 +216,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_cgamutday"]) + ['canonlog_cgamutday']) colorspaces.append(c_log_5) c_log_6 = create_c_log( @@ -225,7 +225,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["canonlog_cgamuttung"]) + ['canonlog_cgamuttung']) colorspaces.append(c_log_6) # Linearization Only @@ -235,7 +235,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["crv_canonlog"]) + ['crv_canonlog']) colorspaces.append(c_log_7) # Primaries Only @@ -245,7 +245,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canonrec709day"]) + ['lin_canonrec709day']) colorspaces.append(c_log_8) c_log_9 = create_c_log( @@ -254,7 +254,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canonrec709tung"]) + ['lin_canonrec709tung']) colorspaces.append(c_log_9) c_log_10 = create_c_log( @@ -263,7 +263,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canondcip3day"]) + ['lin_canondcip3day']) colorspaces.append(c_log_10) c_log_11 = create_c_log( @@ -272,7 +272,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canondcip3tung"]) + ['lin_canondcip3tung']) colorspaces.append(c_log_11) c_log_12 = create_c_log( @@ -281,7 +281,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canoncgamutday"]) + ['lin_canoncgamutday']) colorspaces.append(c_log_12) c_log_13 = create_c_log( @@ -290,7 +290,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Canon-Log', lut_directory, lut_resolution_1d, - ["lin_canoncgamuttung"]) + ['lin_canoncgamuttung']) colorspaces.append(c_log_13) return colorspaces 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 3059b06..2044804 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/general.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/general.py @@ -329,7 +329,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace('XYZ-D60', to_reference_values=[aces.ACES_XYZ_TO_AP0], from_reference_values=[aces.ACES_AP0_TO_XYZ], - aliases=["lin_xyz_d60"]) + aliases=['lin_xyz_d60']) colorspaces.append(cs) # @@ -343,7 +343,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - P3-D60', from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_P3D60], - aliases=["lin_p3d60"]) + aliases=['lin_p3d60']) colorspaces.append(cs) # @@ -357,7 +357,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - P3-DCI', from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_P3DCI], - aliases=["lin_p3dci"]) + aliases=['lin_p3dci']) colorspaces.append(cs) # @@ -372,7 +372,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - sRGB', from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec709], - aliases=["lin_srgb"]) + aliases=['lin_srgb']) colorspaces.append(cs) # *Linear* to *sRGB* Transfer Function* @@ -382,7 +382,7 @@ def create_colorspaces(lut_directory, transfer_function_sRGB_to_linear, lut_directory, lut_resolution_1d, - aliases=["crv_srgb"]) + aliases=['crv_srgb']) colorspaces.append(cs) # *ACES* to *sRGB* Primaries + Transfer Function* @@ -393,7 +393,7 @@ def create_colorspaces(lut_directory, lut_directory, lut_resolution_1d, from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec709], - aliases=["srgb"]) + aliases=['srgb']) colorspaces.append(cs) # @@ -407,7 +407,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - Rec.709', from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec709], - aliases=["lin_rec709"]) + aliases=['lin_rec709']) colorspaces.append(cs) # *Linear* to *Rec. 709* Transfer Function* @@ -417,7 +417,7 @@ def create_colorspaces(lut_directory, transfer_function_Rec709_to_linear, lut_directory, lut_resolution_1d, - aliases=["crv_rec709"]) + aliases=['crv_rec709']) colorspaces.append(cs) # *ACES* to *Rec. 709* Primaries + Transfer Function* @@ -428,7 +428,7 @@ def create_colorspaces(lut_directory, lut_directory, lut_resolution_1d, from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec709], - aliases=["rec709_camera"]) + aliases=['rec709_camera']) colorspaces.append(cs) # @@ -442,7 +442,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - Rec.2020', from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec2020], - aliases=["lin_rec2020"]) + aliases=['lin_rec2020']) colorspaces.append(cs) # *Linear* to *Rec. 2020 10 bit* Transfer Function* @@ -452,7 +452,7 @@ def create_colorspaces(lut_directory, transfer_function_Rec2020_10bit_to_linear, lut_directory, lut_resolution_1d, - aliases=["crv_rec2020"]) + aliases=['crv_rec2020']) colorspaces.append(cs) # *ACES* to *Rec. 2020 10 bit* Primaries + Transfer Function* @@ -463,7 +463,7 @@ def create_colorspaces(lut_directory, lut_directory, lut_resolution_1d, from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec2020], - aliases=["rec2020_camera"]) + aliases=['rec2020_camera']) colorspaces.append(cs) # @@ -477,7 +477,7 @@ def create_colorspaces(lut_directory, transfer_function_Rec1886_to_linear, lut_directory, lut_resolution_1d, - aliases=["crv_rec1886"]) + aliases=['crv_rec1886']) colorspaces.append(cs) # *ACES* to *sRGB* Primaries + Transfer Function* @@ -488,7 +488,7 @@ def create_colorspaces(lut_directory, lut_directory, lut_resolution_1d, from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec709], - aliases=["rec709_display"]) + aliases=['rec709_display']) colorspaces.append(cs) # *ACES* to *sRGB* Primaries + Transfer Function* @@ -499,7 +499,7 @@ def create_colorspaces(lut_directory, lut_directory, lut_resolution_1d, from_reference_values=[aces.ACES_AP0_TO_XYZ, XYZ_to_Rec2020], - aliases=["rec2020_display"]) + aliases=['rec2020_display']) colorspaces.append(cs) # @@ -513,7 +513,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - RIMM ROMM (ProPhoto)', from_reference_values=[AP0_to_RIMM], - aliases=["lin_prophoto", "lin_rimm"]) + aliases=['lin_prophoto', 'lin_rimm']) colorspaces.append(cs) # @@ -527,7 +527,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - Adobe RGB', from_reference_values=[AP0_to_ADOBERGB], - aliases=["lin_adobergb"]) + aliases=['lin_adobergb']) colorspaces.append(cs) # @@ -542,7 +542,7 @@ def create_colorspaces(lut_directory, cs = create_matrix_colorspace( 'Linear - Adobe Wide Gamut RGB', from_reference_values=[AP0_to_ADOBERGB], - aliases=["lin_adobewidegamutrgb"]) + aliases=['lin_adobewidegamutrgb']) colorspaces.append(cs) return colorspaces @@ -550,10 +550,10 @@ def create_colorspaces(lut_directory, def create_raw(): # *Raw* utility space - name = "Raw" + name = 'Raw' raw = ColorSpace(name) raw.description = 'The %s color space' % name - raw.aliases = ["raw"] + raw.aliases = ['raw'] raw.equality_group = name raw.family = 'Utility' raw.is_data = True diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py index 0b05f57..f44dde2 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/gopro.py @@ -136,7 +136,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Protune', lut_directory, lut_resolution_1d, - ["protuneflat_protunegamutexp"]) + ['protuneflat_protunegamutexp']) colorspaces.append(protune_1) # Linearization Only @@ -146,7 +146,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Protune', lut_directory, lut_resolution_1d, - ["crv_protuneflat"]) + ['crv_protuneflat']) colorspaces.append(protune_2) # Primaries Only @@ -156,7 +156,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'Protune', lut_directory, lut_resolution_1d, - ["lin_protunegamutexp"]) + ['lin_protunegamutexp']) colorspaces.append(protune_3) return colorspaces diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py index 359ec2e..d59e70c 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/panasonic.py @@ -134,7 +134,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'V-Log', lut_directory, lut_resolution_1d, - ["vlog_vgamut"]) + ['vlog_vgamut']) colorspaces.append(v_log_1) # Linearization Only @@ -144,7 +144,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'V-Log', lut_directory, lut_resolution_1d, - ["crv_vlog"]) + ['crv_vlog']) colorspaces.append(v_log_2) # Primaries Only @@ -154,7 +154,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'V-Log', lut_directory, lut_resolution_1d, - ["lin_vgamut"]) + ['lin_vgamut']) colorspaces.append(v_log_3) return colorspaces 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 67792f8..3206cd7 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/red.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/red.py @@ -172,7 +172,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_dgn"]) + ['rlf_dgn']) colorspaces.append(RED_log_film_dragon) RED_log_film_dragon2 = create_RED_log_film( @@ -181,7 +181,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_dgn2"]) + ['rlf_dgn2']) colorspaces.append(RED_log_film_dragon2) RED_log_film_color = create_RED_log_film( @@ -190,7 +190,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_rc"]) + ['rlf_rc']) colorspaces.append(RED_log_film_color) RED_log_film_color2 = create_RED_log_film( @@ -199,7 +199,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_rc2"]) + ['rlf_rc2']) colorspaces.append(RED_log_film_color2) RED_log_film_color3 = create_RED_log_film( @@ -208,7 +208,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_rc3"]) + ['rlf_rc3']) colorspaces.append(RED_log_film_color3) RED_log_film_color4 = create_RED_log_film( @@ -217,7 +217,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["rlf_rc4"]) + ['rlf_rc4']) colorspaces.append(RED_log_film_color4) # Linearization only @@ -227,7 +227,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["crv_rlf"]) + ['crv_rlf']) colorspaces.append(RED_log_film) # Primaries only @@ -237,7 +237,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_dgn"]) + ['lin_dgn']) colorspaces.append(RED_dragon) RED_dragon2 = create_RED_log_film( @@ -246,7 +246,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_dgn2"]) + ['lin_dgn2']) colorspaces.append(RED_dragon2) RED_color = create_RED_log_film( @@ -255,7 +255,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_rc"]) + ['lin_rc']) colorspaces.append(RED_color) RED_color2 = create_RED_log_film( @@ -264,7 +264,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_rc2"]) + ['lin_rc2']) colorspaces.append(RED_color2) RED_color3 = create_RED_log_film( @@ -273,7 +273,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_rc3"]) + ['lin_rc3']) colorspaces.append(RED_color3) RED_color4 = create_RED_log_film( @@ -282,7 +282,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'REDlogFilm', lut_directory, lut_resolution_1d, - ["lin_rc4"]) + ['lin_rc4']) colorspaces.append(RED_color4) return colorspaces diff --git a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py index 8cdc923..9c7026a 100644 --- a/aces_1.0.0/python/aces_ocio/colorspaces/sony.py +++ b/aces_1.0.0/python/aces_ocio/colorspaces/sony.py @@ -62,7 +62,7 @@ def create_s_log(gamut, cs.is_data = False if gamut and transfer_function: - cs.aces_transform_id = "IDT.Sony.%s_%s_10i.a1.v1" % ( + cs.aces_transform_id = 'IDT.Sony.%s_%s_10i.a1.v1' % ( transfer_function.replace('-', ''), gamut.replace('-', '').replace(' ', '_')) @@ -239,7 +239,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log', lut_directory, lut_resolution_1d, - ["slog1_sgamut"]) + ['slog1_sgamut']) colorspaces.append(s_log1_s_gamut) # *S-Log2* @@ -249,7 +249,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["slog2_sgamut"]) + ['slog2_sgamut']) colorspaces.append(s_log2_s_gamut) s_log2_s_gamut_daylight = create_s_log( @@ -258,7 +258,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["slog2_sgamutday"]) + ['slog2_sgamutday']) colorspaces.append(s_log2_s_gamut_daylight) s_log2_s_gamut_tungsten = create_s_log( @@ -267,7 +267,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["slog2_sgamuttung"]) + ['slog2_sgamuttung']) colorspaces.append(s_log2_s_gamut_tungsten) # *S-Log3* @@ -277,7 +277,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log3', lut_directory, lut_resolution_1d, - ["slog3_sgamutcine"]) + ['slog3_sgamutcine']) colorspaces.append(s_log3_s_gamut3Cine) s_log3_s_gamut3 = create_s_log( @@ -286,7 +286,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log3', lut_directory, lut_resolution_1d, - ["slog3_sgamut3"]) + ['slog3_sgamut3']) colorspaces.append(s_log3_s_gamut3) # Linearization Only @@ -296,7 +296,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log', lut_directory, lut_resolution_1d, - ["crv_slog1"]) + ['crv_slog1']) colorspaces.append(s_log1) s_log2 = create_s_log( @@ -305,7 +305,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["crv_slog2"]) + ['crv_slog2']) colorspaces.append(s_log2) s_log3 = create_s_log( @@ -314,7 +314,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log3', lut_directory, lut_resolution_1d, - ["crv_slog3"]) + ['crv_slog3']) colorspaces.append(s_log3) # Primaries Only @@ -324,7 +324,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log', lut_directory, lut_resolution_1d, - ["lin_sgamut"]) + ['lin_sgamut']) colorspaces.append(s_gamut) s_gamut_daylight = create_s_log( @@ -333,7 +333,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["lin_sgamutday"]) + ['lin_sgamutday']) colorspaces.append(s_gamut_daylight) s_gamut_tungsten = create_s_log( @@ -342,7 +342,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log2', lut_directory, lut_resolution_1d, - ["lin_sgamuttung"]) + ['lin_sgamuttung']) colorspaces.append(s_gamut_tungsten) s_gamut3Cine = create_s_log( @@ -351,7 +351,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log3', lut_directory, lut_resolution_1d, - ["lin_sgamut3cine"]) + ['lin_sgamut3cine']) colorspaces.append(s_gamut3Cine) s_gamut3 = create_s_log( @@ -360,7 +360,7 @@ def create_colorspaces(lut_directory, lut_resolution_1d): 'S-Log3', lut_directory, lut_resolution_1d, - ["lin_sgamut3"]) + ['lin_sgamut3']) colorspaces.append(s_gamut3) return colorspaces diff --git a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py index 4d8a38a..b5c1181 100644 --- a/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/tests/tests_aces_config.py @@ -40,7 +40,7 @@ __all__ = ['REFERENCE_CONFIG_ROOT_DIRECTORY', # tests. REFERENCE_CONFIG_ROOT_DIRECTORY = os.path.abspath( os.path.join(os.path.dirname(__file__), '..', '..', '..')) -# REFERENCE_CONFIG_ROOT_DIRECTORY = '/colour-science/colour-ramblings/ocio/aces' +REFERENCE_CONFIG_ROOT_DIRECTORY = '/colour-science/colour-ramblings/ocio/aces' HASH_TEST_PATTERNS = ('\.3dl', '\.lut', '\.csp') UNHASHABLE_TEST_PATTERNS = ('\.icc', '\.ocio') diff --git a/aces_1.0.0/python/aces_ocio/utilities.py b/aces_1.0.0/python/aces_ocio/utilities.py index 1d426d9..0d3f697 100644 --- a/aces_1.0.0/python/aces_ocio/utilities.py +++ b/aces_1.0.0/python/aces_ocio/utilities.py @@ -181,11 +181,11 @@ def replace(string, data): Examples -------- - >>> patterns = {"John" : "Luke", - ... "Jane" : "Anakin", - ... "Doe" : "Skywalker", - ... "Z6PO" : "R2D2"} - >>> data = "Users are: John Doe, Jane Doe, Z6PO." + >>> patterns = {'John' : 'Luke', + ... 'Jane' : 'Anakin', + ... 'Doe' : 'Skywalker', + ... 'Z6PO' : 'R2D2'} + >>> data = 'Users are: John Doe, Jane Doe, Z6PO.' >>> replace(data,patterns ) u'Users are: Luke Skywalker, Anakin Skywalker, R2D2.' """