[gnue] r10314 - in trunk/gnue-common: . src/base

[reinhard]

Author: reinhard
Date: 2011-04-18 03:59:06 -0500 (Mon, 18 Apr 2011)
New Revision: 10314

Modified:
   trunk/gnue-common/
   trunk/gnue-common/src/base/errors.py
   trunk/gnue-common/src/base/log.py
Log:
Never include exception name and message in details, and always print exception
name and message additionally to details.



Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2011-04-18 10:03:25.819999933 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

   + timestamp: 2011-04-18 10:55:02.470999956 +0200
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: common

Name: bzr:file-ids
   - src/base/errors.py 
address@hidden:trunk%2Fgnue-common:src%2Fbase%2Ferrors.py

   + src/base/errors.py 
address@hidden:trunk%2Fgnue-common:src%2Fbase%2Ferrors.py
src/base/log.py address@hidden:trunk%2Fgnue-common:src%2Fbase%2Flog.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5
3153 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 whizman_software_solutions_www.whizman.com-20110131200839-1fm0kcoi0hn3u14c
3152 whizman.com-20110217020317-icwlxpg3y0q9w8g5
3153 address@hidden
3154 address@hidden

Name: bzr:text-parents
   - src/base/errors.py address@hidden

   + src/base/log.py    address@hidden


Modified: trunk/gnue-common/src/base/errors.py
===================================================================
--- trunk/gnue-common/src/base/errors.py        2011-04-18 08:59:03 UTC (rev 
10313)
+++ trunk/gnue-common/src/base/errors.py        2011-04-18 08:59:06 UTC (rev 
10314)
@@ -339,12 +339,12 @@
     if isinstance(evalue, Error) and evalue.detail is not None:
         detail = evalue.detail
     else:
-        lines = traceback.format_exception(etype, evalue, etraceback)
+        lines = traceback.format_tb(etraceback)
         # Delete lines in the traceback as requested.
         if tb_skip:
             del lines[1:tb_skip + 1]
-        # traceback.format_exception() returns an 8 bit string encoded in the
+        # traceback.format_tb() returns an 8 bit string encoded in the
         # current encoding, so we have to convert to Unicode.
-        detail = i18n.inconv(''.join(lines))
+        detail = i18n.inconv("".join(lines))
 
     return (group, name, message, detail)

Modified: trunk/gnue-common/src/base/log.py
===================================================================
--- trunk/gnue-common/src/base/log.py   2011-04-18 08:59:03 UTC (rev 10313)
+++ trunk/gnue-common/src/base/log.py   2011-04-18 08:59:06 UTC (rev 10314)
@@ -373,7 +373,7 @@
     (group, name, message, detail) = errors.format_exception(etype, evalue,
             etraceback)
     logger = "exception.%s.%s" % (group, name)
-    text = u_("Unhandled exception %s:\n%s") % (name, detail)
+    text = u_("Unhandled exception %s: %s\n%s") % (name, message, detail)
     error_n(logger, text)
 
 
@@ -398,7 +398,7 @@
     # module, since we want to show the details as returned by get_exception
     # instead of the standard traceback.
     (group, name, message, detail) = errors.get_exception()
-    error(msg + '\n' + detail, *args, **kwargs)
+    error(msg + ": " + name + ": " + message + "\n" + detail, *args, **kwargs)
     return True
 
 # -----------------------------------------------------------------------------
@@ -409,7 +409,7 @@
     the current call stack.
     """
 
-    debug(msg + '\n' + ''.join(traceback.format_stack(
+    debug(msg + "\n" + "".join(traceback.format_stack(
         inspect.currentframe().f_back)), *args, **kwargs)
 
 
@@ -435,8 +435,9 @@
     # We don't use the standard exception handling feature in Python's logging
     # module, since we want to show the details as returned by get_exception
     # instead of the standard traceback.
-    (group, name, message, detail) = errors.get_exception()
-    error_n(msg + '\n' + detail, *args, **kwargs)
+    (group, ename, message, detail) = errors.get_exception()
+    error_n(name, msg + "\n" + ename + ": " + message + "\n" + detail, *args,
+            **kwargs)
     return True
 
 # -----------------------------------------------------------------------------
@@ -447,7 +448,7 @@
     including information about the current call stack.
     """
 
-    debug_n(name, msg + '\n' + ''.join(traceback.format_stack(
+    debug_n(name, msg + "\n" + "".join(traceback.format_stack(
         inspect.currentframe().f_back)), *args, **kwargs)