[Checkins] SVN: zc.monitor/trunk/s fix tracebacks; prepare for 0.1.1

Gary Poster gary at modernsongs.com
Sun Sep 14 21:54:06 EDT 2008


Log message for revision 91153:
  fix tracebacks; prepare for 0.1.1

Changed:
  U   zc.monitor/trunk/setup.py
  U   zc.monitor/trunk/src/zc/monitor/CHANGES.txt
  U   zc.monitor/trunk/src/zc/monitor/README.txt
  U   zc.monitor/trunk/src/zc/monitor/__init__.py

-=-
Modified: zc.monitor/trunk/setup.py
===================================================================
--- zc.monitor/trunk/setup.py	2008-09-14 22:43:34 UTC (rev 91152)
+++ zc.monitor/trunk/setup.py	2008-09-15 01:54:05 UTC (rev 91153)
@@ -8,7 +8,7 @@
 
 setup(
     name = name,
-    version = '0.1.1a1',
+    version = '0.1.1',
     author = 'Jim Fulton',
     author_email = 'jim at zope.com',
     license = 'ZPL 2.1',

Modified: zc.monitor/trunk/src/zc/monitor/CHANGES.txt
===================================================================
--- zc.monitor/trunk/src/zc/monitor/CHANGES.txt	2008-09-14 22:43:34 UTC (rev 91152)
+++ zc.monitor/trunk/src/zc/monitor/CHANGES.txt	2008-09-15 01:54:05 UTC (rev 91153)
@@ -2,6 +2,11 @@
 Change History
 ==============
 
+0.1.1 (2008-09-14)
+------------------
+
+- Bugfix: fixed and added test for regression in displaying tracebacks.
+
 0.1.0 (2008-09-14)
 ------------------
 

Modified: zc.monitor/trunk/src/zc/monitor/README.txt
===================================================================
--- zc.monitor/trunk/src/zc/monitor/README.txt	2008-09-14 22:43:34 UTC (rev 91152)
+++ zc.monitor/trunk/src/zc/monitor/README.txt	2008-09-15 01:54:05 UTC (rev 91153)
@@ -132,3 +132,13 @@
     >>> connection.test_input('quit\n')
     Goodbye.
     -> CLOSE
+
+Finally, it's worth noting that exceptions will generate a
+traceback on the connection.
+
+    >>> connection.test_input('hello Jim 42\n') # doctest: +ELLIPSIS
+    Traceback (most recent call last):
+    ...
+    TypeError: hello() takes at most 2 arguments (3 given)
+    <BLANKLINE>
+    -> CLOSE

Modified: zc.monitor/trunk/src/zc/monitor/__init__.py
===================================================================
--- zc.monitor/trunk/src/zc/monitor/__init__.py	2008-09-14 22:43:34 UTC (rev 91152)
+++ zc.monitor/trunk/src/zc/monitor/__init__.py	2008-09-15 01:54:05 UTC (rev 91153)
@@ -56,10 +56,11 @@
             except Exception, v:
                 traceback.print_exc(100, connection)
                 print >> connection, "%s: %s\n" % (v.__class__.__name__, v)
-            if res is INTERACTIVE_MARKER:
-                self.mode = res
-            elif res is QUIT_MARKER:
-                self.mode = res
+            else:
+                if res is INTERACTIVE_MARKER:
+                    self.mode = res
+                elif res is QUIT_MARKER:
+                    self.mode = res
 
         if self.mode is QUIT_MARKER:
             connection.write(zc.ngi.END_OF_DATA)



More information about the Checkins mailing list