From: W. Trevor King <wking@tremily.us>
Date: Sat, 29 Sep 2012 11:12:59 +0000 (-0400)
Subject: proxy: don't pass arguments to format_exc() in IkiWikiProcedureProxy.run()
X-Git-Tag: 3.20121016~21
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/409f9341d17ba88685f08b561378d6c0c783b405

proxy: don't pass arguments to format_exc() in IkiWikiProcedureProxy.run()

This avoids:

  Traceback (most recent call last):
    File "./plugins/rst", line 86, in <module>
      proxy.run()
    File "/home/wking/src/ikiwiki/plugins/proxy.py", line 316, in run
      e, traceback.format_exc(sys.exc_info()[2])))
    File "/usr/lib/python3.2/traceback.py", line 269, in format_exc
    ...
  TypeError: unorderable types: int() < traceback()

The syntax for format_exc in Python 2.x is:

  traceback.format_exc([limit])

In Python 3.x, it is:

  traceback.format_exc(limit=None, chain=True)

Neither of these need any information from sys.exc_info() passed in.
---

diff --git a/plugins/proxy.py b/plugins/proxy.py
index 60ea89967..656c9e5bd 100755
--- a/plugins/proxy.py
+++ b/plugins/proxy.py
@@ -312,8 +312,8 @@ class IkiWikiProcedureProxy(object):
 
         except Exception as e:
             import traceback
-            self.error('uncaught exception: {}\n{}'.format(
-                        e, traceback.format_exc(sys.exc_info()[2])))
+            tb = traceback.format_exc()
+            self.error('uncaught exception: {}\n{}'.format(e, tb))
             return
 
     def _importme(self):