contrib/simplemerge
changeset 7080 a6477aa893b8
parent 6002 abd66eb0889e
child 8269 bb9f13974d8e
equal deleted inserted replaced
7079:0b74409d5858 7080:a6477aa893b8
    40     opts_len = max([len(opt[0]) for opt in out_opts])
    40     opts_len = max([len(opt[0]) for opt in out_opts])
    41     for first, second in out_opts:
    41     for first, second in out_opts:
    42         sys.stdout.write(' %-*s  %s\n' % (opts_len, first, second))
    42         sys.stdout.write(' %-*s  %s\n' % (opts_len, first, second))
    43 
    43 
    44 try:
    44 try:
       
    45     for fp in (sys.stdin, sys.stdout, sys.stderr):
       
    46         util.set_binary(fp)
       
    47     
    45     opts = {}
    48     opts = {}
    46     try:
    49     try:
    47         args = fancyopts.fancyopts(sys.argv[1:], options, opts)
    50         args = fancyopts.fancyopts(sys.argv[1:], options, opts)
    48     except fancyopts.getopt.GetoptError, e:
    51     except fancyopts.getopt.GetoptError, e:
    49         raise ParseError(e)
    52         raise ParseError(e)