cleanin up coding conventions

This commit is contained in:
q
2018-11-08 18:36:27 +02:00
parent 1a7855242c
commit c4b484a7b9
2 changed files with 111 additions and 74 deletions

View File

@@ -37,10 +37,20 @@ def asc2png(inFile,outFile):
scipy.misc.imsave(outFile, im) scipy.misc.imsave(outFile, im)
if __name__ == "__main__":
parser=ArgumentParser(description="Convert image to ascii, or ascii to image. If only input is defined, it is assumed as image (PNG).") parser = ArgumentParser(
parser.add_argument('input', action="store") description = "Convert image to ascii, or ascii to image. If only input is defined, it is assumed as image (PNG)."
parser.add_argument('output', action="store", nargs='?') )
parser.add_argument(
'input',
action = "store"
)
parser.add_argument(
'output',
action = "store",
nargs = '?'
)
opts = parser.parse_args() opts = parser.parse_args()
if opts.output == None: if opts.output == None:

View File

@@ -2,8 +2,10 @@
import sys,re,os import sys,re,os
from argparse import ArgumentParser from argparse import ArgumentParser
from argparse import RawTextHelpFormatter from argparse import RawTextHelpFormatter
def setup_options(): def setup_options():
parser=ArgumentParser(description="""Template Filler parser = ArgumentParser(
description="""Template Filler
=== Template example: === === Template example: ===
Hello [[name]]! Hello [[name]]!
@@ -12,18 +14,39 @@ def setup_options():
== Value file/Value pair example: == == Value file/Value pair example: ==
[[name]]=John [[name]]=John
[[letter]]=@letter.txt [[letter]]=@letter.txt
""",formatter_class=RawTextHelpFormatter) """,
parser.add_argument("-e",action="store_true",dest="env",default=False, formatter_class = RawTextHelpFormatter
help="Use the environment to replace ${env} style variables.") )
parser.add_argument("-f",action="store",dest="file", parser.add_argument(
help="File name to read keys/values.") "-e",
parser.add_argument("-p",action="append",dest="values",default=[], action = "store_true",
help="key=value pairs. This option may be issued several times.") dest = "env",
parser.add_argument('template', action="store", nargs='?', default = False,
help="Template file to be filled. If not defined, stdin used.") help = "Use the environment to replace ${env} style variables."
)
parser.add_argument(
"-f",
action = "store",
dest = "file",
help = "File name to read keys/values."
)
parser.add_argument(
"-p",
action = "append",
dest = "values",
default = [],
help = "key=value pairs. This option may be issued several times."
)
parser.add_argument(
'template',
action = "store",
nargs = '?',
help = "Template file to be filled. If not defined, stdin used."
)
options = parser.parse_args() options = parser.parse_args()
return options return options
def parse_file(filename): def parse_file(filename):
pairs = [] pairs = []
with open(filename, "r") as reader: with open(filename, "r") as reader:
@@ -33,7 +56,9 @@ def parse_file(filename):
continue continue
tokens = l.split('=', 1) tokens = l.split('=', 1)
if len(tokens) != 2: if len(tokens) != 2:
print("File %s:%i key=value pair '%s' does not parse"%(filename,i+1,l,)) print("File %s:%i key=value pair '%s' does not parse"%(
filename, i+1, l,
))
sys.exit(1) sys.exit(1)
pairs.append( (tokens[0], tokens[1].decode('string_escape')) ) pairs.append( (tokens[0], tokens[1].decode('string_escape')) )
return pairs return pairs
@@ -48,6 +73,8 @@ def parse_arguments(args):
pairs.append( (tokens[0], tokens[1].decode('string_escape')) ) pairs.append( (tokens[0], tokens[1].decode('string_escape')) )
return pairs return pairs
if __name__ == "__main__":
options = setup_options(); options = setup_options();
pairs = [] pairs = []
if options.file != None: if options.file != None: