<!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" />
<title>[12107] twext/trunk/twext/internet/fswatch.py</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12107">12107</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 20:28:31 -0800 (Fri, 13 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>lint</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextinternetfswatchpy">twext/trunk/twext/internet/fswatch.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextinternetfswatchpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/internet/fswatch.py (12106 => 12107)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/internet/fswatch.py        2013-12-14 04:28:08 UTC (rev 12106)
+++ twext/trunk/twext/internet/fswatch.py        2013-12-14 04:28:31 UTC (rev 12107)
</span><span class="lines">@@ -24,8 +24,10 @@
</span><span class="cx"> from twisted.python.log import Logger
</span><span class="cx"> 
</span><span class="cx"> try:
</span><del>-    from select import (kevent, KQ_FILTER_VNODE, KQ_EV_ADD, KQ_EV_ENABLE,
-                        KQ_EV_CLEAR, KQ_NOTE_DELETE, KQ_NOTE_RENAME, KQ_EV_EOF)
</del><ins>+    from select import (
+        kevent, KQ_FILTER_VNODE, KQ_EV_ADD, KQ_EV_ENABLE,
+        KQ_EV_CLEAR, KQ_NOTE_DELETE, KQ_NOTE_RENAME, KQ_EV_EOF
+    )
</ins><span class="cx">     kqueueSupported = True
</span><span class="cx"> except ImportError:
</span><span class="cx">     # kqueue not supported on this platform
</span><span class="lines">@@ -37,22 +39,22 @@
</span><span class="cx">     A delegate of DirectoryChangeListener
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def disconnected(): #@NoSelf
</del><ins>+    def disconnected():
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         The directory has been unmounted
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def deleted(): #@NoSelf
</del><ins>+    def deleted():
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         The directory has been deleted
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def renamed(): #@NoSelf
</del><ins>+    def renamed():
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         The directory has been renamed
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-    def connectionLost(reason): #@NoSelf
</del><ins>+    def connectionLost(reason):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         The file descriptor has been closed
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -65,10 +67,12 @@
</span><span class="cx">     def patchReactor(reactor):
</span><span class="cx">         # Wrap _doWriteOrRead to support KQ_FILTER_VNODE
</span><span class="cx">         origDoWriteOrRead = reactor._doWriteOrRead
</span><ins>+
</ins><span class="cx">         def _doWriteOrReadOrVNodeEvent(selectable, fd, event):
</span><span class="cx">             origDoWriteOrRead(selectable, fd, event)
</span><span class="cx">             if event.filter == KQ_FILTER_VNODE:
</span><span class="cx">                 selectable.vnodeEventHappened(event)
</span><ins>+
</ins><span class="cx">         reactor._doWriteOrRead = _doWriteOrReadOrVNodeEvent
</span><span class="cx"> 
</span><span class="cx">     patchReactor(reactor)
</span><span class="lines">@@ -138,8 +142,10 @@
</span><span class="cx">         def __init__(self, reactor, dirname, listenee):
</span><span class="cx">             &quot;&quot;&quot;
</span><span class="cx">             @param reactor: the reactor
</span><del>-            @param dirname: the full path to the directory to watch
-            @param listenee: 
</del><ins>+            @param dirname: the full path to the directory to watch; it must
+                already exist
+            @param listenee: the delegate to call
+            @type listenee: IDirectoryChangeListenee
</ins><span class="cx">             &quot;&quot;&quot;
</span><span class="cx">             self._reactor = reactor
</span><span class="cx">             self._fd = os.open(dirname, os.O_RDONLY)
</span><span class="lines">@@ -166,4 +172,3 @@
</span><span class="cx">         def connectionLost(self, reason):
</span><span class="cx">             os.close(self._fd)
</span><span class="cx">             self._listenee.connectionLost(reason)
</span><del>-
</del></span></pre>
</div>
</div>

</body>
</html>