hard-coded python2.3-ism (socket.timeout) fixed

Author: Richard Jones

BUILD.txt

@@ -7,20 +7,25 @@ want it to stay that way, too.
 This means that we only need to ever build source releases. This is done by
 running:
 
-1. Make sure the unit tests run! "./run_tests"
-2. Edit roundup/__init__.py and doc/announcement.txt to reflect the new
-   version and appropriate announcements. Add truncated announcement to
-   setup.py description field.
-3. python setup.py clean --all
-4. Edit setup.py to ensure that all information therein (version, contact
-   information etc) is correct.
-5. python setup.py sdist --manifest-only
-6. Check the MANIFEST to make sure that any new files are included. If
-   they are not, edit MANIFEST.in to include them. "Documentation" for
-   MANIFEST.in may be found in disutils.filelist._parse_template_line.
-7. python setup.py sdist
-   (if you find sdist a little verbose, add "--quiet" to the end of the
-    command)
+1.  Make sure the unit tests run! "./run_tests"
+2.  Edit roundup/__init__.py and doc/announcement.txt to reflect the new
+    version and appropriate announcements. Add truncated announcement to
+    setup.py description field.
+3.  python setup.py clean --all
+4.  Edit setup.py to ensure that all information therein (version, contact
+    information etc) is correct.
+5.  python setup.py sdist --manifest-only
+6.  Check the MANIFEST to make sure that any new files are included. If
+    they are not, edit MANIFEST.in to include them. "Documentation" for
+    MANIFEST.in may be found in disutils.filelist._parse_template_line.
+7.  python setup.py sdist
+    (if you find sdist a little verbose, add "--quiet" to the end of the
+     command)
+8.  unpack the new dist file in /tmp and a) run_test, and b) demo.py
+9.  Generate gpg signature with "gpg -a --detach-sign" and upload to
+    mechanicalcat.net
+10. PyPI registration
+11. tag the CVS for the release, eg. "cvs tag -R release-0-6-3"
 
 So, those commands in a nice, cut'n'pasteable form::
 

CHANGES.txt

@@ -3,8 +3,10 @@ are given with the most recent entry first.
 
 2003-??-?? 0.6.4
 Fixed:
+- hard-coded python2.3-ism (socket.timeout) fixed
 - Fixed activity displaying as future because of Date arithmetic fix in 0.6.3
-(sf bug 842027).
+  (sf bug 842027).
+
 
 2003-11-14 0.6.3
 Fixed:

roundup/__init__.py

@@ -15,7 +15,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: __init__.py,v 1.25.2.3 2003-11-11 22:25:00 richard Exp $
+# $Id: __init__.py,v 1.25.2.4 2003-12-04 02:39:04 richard Exp $
 
 ''' Roundup - issue tracking for knowledge workers.
 
@@ -67,6 +67,6 @@
 much prettier cake :)
 '''
 
-__version__ = '0.6.3'
+__version__ = '0.6.4'
 
 # vim: set filetype=python ts=4 sw=4 et si

roundup/scripts/roundup_server.py

@@ -16,7 +16,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup_server.py,v 1.26.2.2 2003-11-11 22:25:00 richard Exp $
+$Id: roundup_server.py,v 1.26.2.3 2003-12-04 02:39:04 richard Exp $
 """
 
 # python version check
@@ -78,26 +78,28 @@ def run_cgi(self):
             self.send_error(404, self.path)
         except client.Unauthorised:
             self.send_error(403, self.path)
-        except socket.timeout:
-            s = StringIO.StringIO()
-            traceback.print_exc(None, s)
-            self.log_message(str(s.getvalue()))
         except:
-            # it'd be nice to be able to detect if these are going to have
-            # any effect...
-            self.send_response(400)
-            self.send_header('Content-Type', 'text/html')
-            self.end_headers()
-            try:
-                reload(cgitb)
-                self.wfile.write(cgitb.breaker())
-                self.wfile.write(cgitb.html())
-            except:
+            exc, val, tb = sys.exc_info()
+            if hasattr(socket, 'timeout') and exc == socket.timeout:
                 s = StringIO.StringIO()
                 traceback.print_exc(None, s)
-                self.wfile.write("<pre>")
-                self.wfile.write(cgi.escape(s.getvalue()))
-                self.wfile.write("</pre>\n")
+                self.log_message(str(s.getvalue()))
+            else:
+                # it'd be nice to be able to detect if these are going to have
+                # any effect...
+                self.send_response(400)
+                self.send_header('Content-Type', 'text/html')
+                self.end_headers()
+                try:
+                    reload(cgitb)
+                    self.wfile.write(cgitb.breaker())
+                    self.wfile.write(cgitb.html())
+                except:
+                    s = StringIO.StringIO()
+                    traceback.print_exc(None, s)
+                    self.wfile.write("<pre>")
+                    self.wfile.write(cgi.escape(s.getvalue()))
+                    self.wfile.write("</pre>\n")
         sys.stdin = save_stdin
 
     do_GET = do_POST = run_cgi