From afff0b86143c534f480c34bd5c35081eca19629d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 29 Jul 2016 17:48:40 -0400 Subject: [PATCH] fixed STDOUT error no files on command line translate to "filename" being empty list. Cannot test for filename[0] then... --- processing/post/perceptualUniformColorMap.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/processing/post/perceptualUniformColorMap.py b/processing/post/perceptualUniformColorMap.py index 85acd073b..96e676337 100755 --- a/processing/post/perceptualUniformColorMap.py +++ b/processing/post/perceptualUniformColorMap.py @@ -49,7 +49,7 @@ parser.set_defaults(right = (0.0,0.0,0.0)) (options,filename) = parser.parse_args() if options.format not in outtypes: - parser.error('invalid format: "%s" (can be %s).'%(options.format,', '.join(outtypes))) + parser.error('invalid format: "{}" (choices: {}).'.format(options.format,', '.join(outtypes))) if options.N < 2: parser.error('too few steps (need at least 2).') @@ -59,10 +59,9 @@ if options.trim[0] < -1.0 or \ options.trim[0] >= options.trim[1]: parser.error('invalid trim range (-1 +1).') - -name = options.format if filename[0] is None\ +name = options.format if filename == [] \ else filename[0] -output = sys.stdout if filename[0] is None\ +output = sys.stdout if filename == [] \ else open(os.path.basename(filename[0])+extensions[outtypes.index(options.format)],'w') colorLeft = damask.Color(options.colormodel.upper(), list(options.left))