From: Thomas Mansencal Date: Mon, 19 Jan 2015 16:25:15 +0000 (+0100) Subject: Static analysis session. X-Git-Url: http://users.mur.at/ms/git/gitweb/?p=OpenColorIO-Configs.git;a=commitdiff_plain;h=334e8bd4d18f6b4ad0bd616638f349825e9610b8 Static analysis session. --- diff --git a/aces_1.0.0/python/aces_ocio/create_aces_config.py b/aces_1.0.0/python/aces_ocio/create_aces_config.py index befe6f2..e83896a 100755 --- a/aces_1.0.0/python/aces_ocio/create_aces_config.py +++ b/aces_1.0.0/python/aces_ocio/create_aces_config.py @@ -560,8 +560,7 @@ def generate_LUTs(odt_info, 'type': 'matrix', 'matrix': adx_to_cdd, 'offset': offset, - 'direction': 'forward' - }) + 'direction': 'forward'}) # Convert from Channel-Dependent Density to Channel-Independent Density cs.to_reference_transforms.append({ @@ -570,8 +569,7 @@ def generate_LUTs(odt_info, 0.05901, 0.96928, -0.02829, 0, 0.16134, 0.07406, 0.76460, 0, 0.0, 0.0, 0.0, 1.0], - 'direction': 'forward' - }) + 'direction': 'forward'}) # Copied from *Alex Fry*'s *adx_cid_to_rle.py* def create_CID_to_RLE_LUT(): @@ -1170,8 +1168,14 @@ def generate_LUTs(odt_info, # Generic Matrix transform # ------------------------------------------------------------------------- def create_generic_matrix(name='matrix', - from_reference_values=[], - to_reference_values=[]): + from_reference_values=None, + to_reference_values=None): + + if from_reference_values is None: + from_reference_values = [] + if to_reference_values is None: + to_reference_values = [] + cs = ColorSpace(name) cs.description = 'The %s color space' % name cs.equality_group = name @@ -1504,7 +1508,7 @@ def get_ODT_info(aces_CTL_directory): # Add to list of ODTs odts[odt_name] = {} odts[odt_name]['transformCTL'] = os.path.join(odt_dir, transform_CTL) - if transform_CTL_inverse != None: + if transform_CTL_inverse is not None: odts[odt_name]['transformCTLInverse'] = os.path.join( odt_dir, transform_CTL_inverse) @@ -1590,7 +1594,7 @@ def get_LMT_info(aces_CTL_directory): lmts[lmt_name] = {} lmts[lmt_name]['transformCTL'] = os.path.join(lmt_dir, transform_CTL) - if transform_CTL_inverse != None: + if transform_CTL_inverse is not None: lmts[lmt_name]['transformCTLInverse'] = os.path.join( lmt_dir, transform_CTL_inverse) diff --git a/aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py b/aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py index fba4c80..af334b8 100644 --- a/aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py +++ b/aces_1.0.0/python/aces_ocio/create_sony_colorspaces.py @@ -60,7 +60,7 @@ def create_s_log(gamut, ab = 90. w = 940. - if (s_log >= ab): + if s_log >= ab: linear = ((pow(10., (((s_log - b) / (w - b) - 0.616596 - 0.03) / 0.432699)) - @@ -75,7 +75,7 @@ def create_s_log(gamut, ab = 90. w = 940. - if (s_log >= ab): + if s_log >= ab: linear = ((219. * (pow(10., (((s_log - b) / (w - b) - 0.616596 - 0.03) / 0.432699)) - diff --git a/aces_1.0.0/python/aces_ocio/generate_lut.py b/aces_1.0.0/python/aces_ocio/generate_lut.py index 3ff606d..1f23b06 100755 --- a/aces_1.0.0/python/aces_ocio/generate_lut.py +++ b/aces_1.0.0/python/aces_ocio/generate_lut.py @@ -206,10 +206,10 @@ def generate_3d_LUT_from_image(ramp_3d_path, output_path=None, resolution=32): def apply_CTL_to_image(input_image, output_image, - ctl_paths=[], + ctl_paths=None, input_scale=1.0, output_scale=1.0, - global_params={}, + global_params=None, aces_CTL_directory=None): """ Object description. @@ -225,6 +225,11 @@ def apply_CTL_to_image(input_image, Return value description. """ + if ctl_paths is None: + ctl_paths = [] + if global_params is None: + global_params = {} + if len(ctl_paths) > 0: ctlenv = os.environ if aces_CTL_directory is not None: @@ -285,7 +290,7 @@ def generate_1d_LUT_from_CTL(lut_path, identity_LUT_bit_depth='half', input_scale=1.0, output_scale=1.0, - global_params={}, + global_params=None, cleanup=True, aces_CTL_directory=None, min_value=0.0, @@ -304,6 +309,9 @@ def generate_1d_LUT_from_CTL(lut_path, Return value description. """ + if global_params is None: + global_params = {} + lut_path_base = os.path.splitext(lut_path)[0] identity_LUT_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff') @@ -420,7 +428,7 @@ def generate_3d_LUT_from_CTL(lut_path, identity_LUT_bit_depth='half', input_scale=1.0, output_scale=1.0, - global_params={}, + global_params=None, cleanup=True, aces_CTL_directory=None): """ @@ -437,6 +445,9 @@ def generate_3d_LUT_from_CTL(lut_path, Return value description. """ + if global_params is None: + global_params = {} + lut_path_base = os.path.splitext(lut_path)[0] identity_LUT_image_float = '%s.%s.%s' % (lut_path_base, 'float', 'tiff') diff --git a/aces_1.0.0/python/aces_ocio/process.py b/aces_1.0.0/python/aces_ocio/process.py index db23fc3..062855e 100755 --- a/aces_1.0.0/python/aces_ocio/process.py +++ b/aces_1.0.0/python/aces_ocio/process.py @@ -74,7 +74,7 @@ class Process: def __init__(self, description=None, cmd=None, - args=[], + args=None, cwd=None, env=None, batch_wrapper=False): @@ -92,6 +92,9 @@ class Process: Return value description. """ + if args is None: + args = [] + self.cmd = cmd if not description: self.description = cmd @@ -148,7 +151,7 @@ class Process: Return value description. """ - if key != None and (value != None or start_stop != None): + if key is not None and (value is not None or start_stop is not None): indent = '\t' * write_dict['indentationLevel'] if write_dict['format'] == 'xml': if start_stop == 'start': @@ -413,7 +416,7 @@ class Process: # Using *subprocess* if sp: - if process != None: + if process is not None: # pid = process.pid # log.logLine('process id %s\n' % pid) @@ -431,14 +434,16 @@ class Process: # This is now used to ensure that the process has finished. line = '' - while line != None and process.poll() is None: + while line is not None and process.poll() is None: try: line = process.stdout.readline() except: break # 3.1 try: - self.log_line(str(line, encoding='utf-8')) + # TODO: Investigate previous eroneous statement. + # self.log_line(str(line, encoding='utf-8')) + self.log_line(str(line)) # 2.6 except: self.log_line(line) @@ -460,6 +465,8 @@ class Process: exit_code = -1 try: stdout_lines = stdout.readlines() + # TODO: Investigate if this is the good behavior, close() does + # not return anything / None. exit_code = stdout.close() stdout.close() 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 8814e90..229c880 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 @@ -99,11 +99,12 @@ class TestACESConfig(unittest.TestCase): hashes = {} for path in files_walker(directory, filters_in=filters_in, - filters_out=filters_out): + filters_out=filters_out, + flags=flags): with open(path) as file: - hash = hashlib.md5( + digest = hashlib.md5( re.sub('\s', '', file.read())).hexdigest() - hashes[path.replace(directory, '')] = hash + hashes[path.replace(directory, '')] = digest return hashes def test_ACES_config(self):