diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-06-12 15:41:21 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2017-06-12 15:41:21 +0000 |
commit | 26674765cfb8c9cbfa63dd0116dd30c25d1b77ee (patch) | |
tree | 48bd20c2d0bbf7d2502d25fdb6d6aba8c7614fa9 | |
parent | 0407ef8d71f0a717b364856f631a469231df3401 (diff) | |
download | netpbm-mirror-26674765cfb8c9cbfa63dd0116dd30c25d1b77ee.tar.gz netpbm-mirror-26674765cfb8c9cbfa63dd0116dd30c25d1b77ee.tar.xz netpbm-mirror-26674765cfb8c9cbfa63dd0116dd30c25d1b77ee.zip |
Re-raise in a way that works with both Python 2 and Python 3
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2996 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-x | buildtools/makeman | 7 | ||||
-rw-r--r-- | doc/HISTORY | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/buildtools/makeman b/buildtools/makeman index b1d30afd..dee6d6ef 100755 --- a/buildtools/makeman +++ b/buildtools/makeman @@ -332,9 +332,7 @@ def main(args, mainout=sys.stdout, mainerr=sys.stderr): outdoc = makeman(name, file, indoc) except: os.remove(tempfile) - # Pass the exception upwards - (exc_type, exc_value, exc_traceback) = sys.exc_info() - raise exc_type, exc_value, exc_traceback + raise if outdoc == indoc: os.remove(tempfile) if outdoc is None: @@ -355,8 +353,7 @@ def main(args, mainout=sys.stdout, mainerr=sys.stderr): return 4 except: if verbosity: - (exc_type, exc_value, exc_traceback) = sys.exc_info() - raise exc_type, exc_value, exc_traceback + raise else: mainerr.write("makeman: internal error!\n") return 5 diff --git a/doc/HISTORY b/doc/HISTORY index e8a65530..4fb1d815 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -60,9 +60,11 @@ not yet BJH Release 10.79.00 (September 2007), but wouldn't even compile until Netpbm 10.42 (March 2008)). - Installnetpbm: Accept globs for directory name responses + installnetpbm: Accept globs for directory name responses (notably, ~/DIR). + makeman: Make it work with Python 3.6. + Build: don't try to build standardppmdfont.c if it already exists (so don't require ppmdcfont to exist). Broken around Netpbm 10.35 (2006). |