Ticket #54493: makeman.diff

File makeman.diff, 2.3 KB (added by gnw3, 7 years ago)

attempt to support python3

Line 
1*** python2/makeman     2017-07-18 10:18:39.000000000 -0300
2--- python3/makeman     2017-07-18 10:16:49.000000000 -0300
3***************
4*** 32,38 ****
5  #   Added footer message to clarify original source.
6  #
7 
8! import os, sys, exceptions, re
9 
10  source = "netpbm documentation"
11  section = 1
12--- 32,38 ----
13  #   Added footer message to clarify original source.
14  #
15 
16! import os, sys, re
17 
18  source = "netpbm documentation"
19  section = 1
20***************
21*** 50,56 ****
22  .IP
23  .B http://netpbm.sourceforge.net/doc/'''
24 
25! class LiftException(exceptions.Exception):
26      def __init__(self, message, retval=1):
27          self.message = message
28          self.retval = retval
29--- 50,56 ----
30  .IP
31  .B http://netpbm.sourceforge.net/doc/'''
32 
33! class LiftException(Exception):
34      def __init__(self, message, retval=1):
35          self.message = message
36          self.retval = retval
37***************
38*** 341,351 ****
39                  outfp.write(outdoc)
40                  outfp.close() # under Windows you can't rename an open file
41                  stem = file[:file.find(".")]
42!                 os.rename(tempfile, stem + "." + `sectmap[file]`)
43!     except LiftException, e:
44          mainerr.write("makeman: " + e.message + "\n")
45          return e.retval
46!     except IOError, e:
47          mainerr.write("makeman: file I/O error: %s\n" % e)
48          return 3
49      except KeyboardInterrupt:
50--- 341,351 ----
51                  outfp.write(outdoc)
52                  outfp.close() # under Windows you can't rename an open file
53                  stem = file[:file.find(".")]
54!                 os.rename(tempfile, stem + "." + repr(sectmap[file]))
55!     except LiftException as e:
56          mainerr.write("makeman: " + e.message + "\n")
57          return e.retval
58!     except IOError as e:
59          mainerr.write("makeman: file I/O error: %s\n" % e)
60          return 3
61      except KeyboardInterrupt:
62***************
63*** 360,366 ****
64 
65  if __name__ == "__main__":
66      # Run the main sequence
67!     raise SystemExit, main(sys.argv[1:])
68 
69  # The following sets edit modes for GNU EMACS
70  # Local Variables:
71--- 360,366 ----
72 
73  if __name__ == "__main__":
74      # Run the main sequence
75!     raise SystemExit(main(sys.argv[1:]))
76 
77  # The following sets edit modes for GNU EMACS
78  # Local Variables: