<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre, #msg p { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[2498] CalendarServer/trunk/twistedcaldav/itip.py</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/calendarserver/changeset/2498">2498</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2008-05-25 12:24:58 -0700 (Sun, 25 May 2008)</dd>
</dl>
<h3>Log Message</h3>
<pre>Not the (unfortunately large number of) bare exceptions here as FIXME.
raise instantiated exceptions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavitippy">CalendarServer/trunk/twistedcaldav/itip.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavitippy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/itip.py (2497 => 2498)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/itip.py 2008-05-25 18:27:29 UTC (rev 2497)
+++ CalendarServer/trunk/twistedcaldav/itip.py 2008-05-25 19:24:58 UTC (rev 2498)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> import md5
</span><span class="cx"> import time
</span><span class="cx">
</span><del>-from twisted.python import failure
</del><span class="cx"> from twisted.internet.defer import waitForDeferred, deferredGenerator, maybeDeferred
</span><span class="cx"> from twisted.web2.dav import davxml
</span><span class="cx"> from twisted.web2.dav.method.report import NumberOfMatchesWithinLimits
</span><span class="lines">@@ -180,8 +179,9 @@
</span><span class="cx"> newInboxResource(child, newchild)
</span><span class="cx"> processed = "processed"
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> # So we have a partial update. That means we have to do partial updates to instances in
</span><span class="lines">@@ -249,8 +249,9 @@
</span><span class="cx">
</span><span class="cx"> processed = "processed"
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx">
</span><span class="cx"> # Remove the now processed incoming request.
</span><span class="cx"> try:
</span><span class="lines">@@ -266,8 +267,9 @@
</span><span class="cx"> }[processed]
</span><span class="cx"> ))
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx"> yield None
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -286,7 +288,7 @@
</span><span class="cx"> """
</span><span class="cx"> log.info("Auto-processing iTIP ADD for: %s" % (str(principal),))
</span><span class="cx">
</span><del>- raise NotImplementedError
</del><ins>+ raise NotImplementedError()
</ins><span class="cx">
</span><span class="cx"> processAdd = deferredGenerator(processAdd)
</span><span class="cx">
</span><span class="lines">@@ -371,8 +373,9 @@
</span><span class="cx"> d.getResult()
</span><span class="cx"> log.info("Delete calendar component %s in %s as it was cancelled." % (calmatch, calURL))
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx"> processed = "processed"
</span><span class="cx"> else:
</span><span class="cx"> processed = "older"
</span><span class="lines">@@ -460,8 +463,9 @@
</span><span class="cx"> }[processed]
</span><span class="cx"> ))
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx"> yield None
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -675,6 +679,7 @@
</span><span class="cx"> yield d
</span><span class="cx"> d.getResult()
</span><span class="cx"> except:
</span><ins>+ # FIXME: bare except
</ins><span class="cx"> yield None
</span><span class="cx"> return
</span><span class="cx">
</span><span class="lines">@@ -757,8 +762,9 @@
</span><span class="cx"> d.getResult()
</span><span class="cx"> log.info("Deleted iTIP message %s in Inbox that was older than the new one." % (i[0],))
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx"> else:
</span><span class="cx"> # For any that are newer or the same, mark the new one to be deleted.
</span><span class="cx"> delete_child = True
</span><span class="lines">@@ -771,8 +777,9 @@
</span><span class="cx"> d.getResult()
</span><span class="cx"> log.info("Deleted new iTIP message %s in Inbox because it was older than existing ones." % (child.fp.basename(),))
</span><span class="cx"> except:
</span><del>- log.err("Error while auto-processing iTIP: %s" % (failure.Failure(),))
- raise iTipException
</del><ins>+ # FIXME: bare except
+ log.err("Error while auto-processing iTIP: %s" % (Failure(),))
+ raise iTipException()
</ins><span class="cx">
</span><span class="cx"> yield delete_child
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>