From 93e3a1f3661d084b500cc08fec0c8d7b0ad25086 Mon Sep 17 00:00:00 2001
From: Vo Minh Thu <vmt@openerp.com>
Date: Thu, 23 Jun 2011 16:36:51 +0200
Subject: [PATCH] [FIX] netsvc: revert introduction of cgitb (was done at revno
 3452, revision-id vmt@openerp.com-20110609073416-ml22a1vhtizl3z71)

lp bug: https://launchpad.net/bugs/797690 fixed

bzr revid: vmt@openerp.com-20110623143651-v1x7obfnj48khsdj
---
 openerp/netsvc.py | 3 +--
 setup.py          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index 42ccab414c7..aca1b9c12a9 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -24,7 +24,6 @@
 #
 ##############################################################################
 
-import cgitb
 import errno
 import heapq
 import logging
@@ -440,7 +439,7 @@ class OpenERPDispatcher:
         except Exception, e:
             self.log('exception', tools.exception_to_unicode(e))
             tb = getattr(e, 'traceback', sys.exc_info())
-            tb_s = cgitb.text(tb)
+            tb_s = "".join(traceback.format_exception(*tb))
             if tools.config['debug_mode'] and isinstance(tb, types.TracebackType):
                 import pdb
                 pdb.post_mortem(tb[2])
diff --git a/setup.py b/setup.py
index 62fb0c9a532..930b266e66b 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ if os.name == 'nt':
                 "pydot", "asyncore","asynchat", "reportlab", "vobject",
                 "HTMLParser", "select", "mako", "poplib",
                 "imaplib", "smtplib", "email", "yaml", "DAV",
-                "uuid", "commands", "openerp", # TODO is it necessary to include cgitb?
+                "uuid", "commands", "openerp",
             ],
             "excludes" : ["Tkconstants","Tkinter","tcl"],
         }