Fix contrib

pym/calculate/contrib/cherrypy/_cpcompat_subprocess.py

@@ -490,7 +490,7 @@ def _eintr_retry_call(func, *args):
     while True:
         try:
             return func(*args)
-        except (OSError, IOError), e:
+        except (OSError, IOError) as e:
             if e.errno == errno.EINTR:
                 continue
             raise

pym/calculate/contrib/cherrypy/wsgiserver/wsgiserver2.py

@@ -2295,7 +2295,8 @@ class WSGIGateway(Gateway):
         # exc_info tuple."
         if self.req.sent_headers:
             try:
-                raise exc_info[0], exc_info[1], exc_info[2]
+                #raise exc_info[0], exc_info[1], exc_info[2]
+                raise exc_info[0]
             finally:
                 exc_info = None