<!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>[12101] twext/trunk/twext/python</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/12101">12101</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 19:02:31 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>More cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextpythonclsproppy">twext/trunk/twext/python/clsprop.py</a></li>
<li><a href="#twexttrunktwextpythonfilepathpy">twext/trunk/twext/python/filepath.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextpythonclsproppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/clsprop.py (12100 => 12101)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/clsprop.py 2013-12-14 02:44:35 UTC (rev 12100)
+++ twext/trunk/twext/python/clsprop.py 2013-12-14 03:02:31 UTC (rev 12101)
</span><span class="lines">@@ -18,6 +18,10 @@
</span><span class="cx"> A small utility for defining static class properties.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+__all__ = ["classproperty"]
+
+
+
</ins><span class="cx"> class classproperty(object):
</span><span class="cx"> """
</span><span class="cx"> Decorator for a method that wants to return a static class property. The
</span><span class="lines">@@ -38,11 +42,13 @@
</span><span class="cx"> def __get__(self, instance, owner):
</span><span class="cx"> if not self.cache:
</span><span class="cx"> return self.thunk(owner)
</span><ins>+
</ins><span class="cx"> cc = self._classcache
</span><ins>+
</ins><span class="cx"> if owner in cc:
</span><span class="cx"> cached = cc[owner]
</span><span class="cx"> else:
</span><span class="cx"> cached = self.thunk(owner)
</span><span class="cx"> cc[owner] = cached
</span><ins>+
</ins><span class="cx"> return cached
</span><del>-
</del></span></pre></div>
<a id="twexttrunktwextpythonfilepathpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/python/filepath.py (12100 => 12101)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/python/filepath.py 2013-12-14 02:44:35 UTC (rev 12100)
+++ twext/trunk/twext/python/filepath.py 2013-12-14 03:02:31 UTC (rev 12101)
</span><span class="lines">@@ -20,32 +20,29 @@
</span><span class="cx"> calendar server.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from os import listdir as _listdir
</del><ins>+__all__ = ["CachingFilePath"]
</ins><span class="cx">
</span><del>-from os.path import (join as _joinpath,
- basename as _basename,
- exists as _exists,
- dirname as _dirname)
-
-from time import sleep as _sleep
</del><ins>+from os import listdir as listdir
+from os.path import join, basename, exists, dirname
+from time import sleep
</ins><span class="cx"> from types import FunctionType, MethodType
</span><span class="cx"> from errno import EINVAL
</span><ins>+from stat import S_ISDIR
</ins><span class="cx">
</span><span class="cx"> from twisted.python.filepath import FilePath as _FilePath
</span><span class="cx">
</span><del>-from stat import S_ISDIR
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> class CachingFilePath(_FilePath, object):
</span><span class="cx"> """
</span><span class="cx"> A descendent of L{_FilePath} which implements a more aggressive caching
</span><span class="cx"> policy.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- _listdir = _listdir # integration points for tests
- _sleep = _sleep
</del><ins>+ _listdir = listdir # integration points for tests
+ _sleep = sleep
</ins><span class="cx">
</span><del>- BACKOFF_MAX = 5.0 # Maximum time to wait between calls to
- # listdir()
</del><ins>+ BACKOFF_MAX = 5.0 # Maximum time to wait between calls to listdir()
</ins><span class="cx">
</span><span class="cx"> def __init__(self, path, alwaysCreate=False):
</span><span class="cx"> super(CachingFilePath, self).__init__(path, alwaysCreate)
</span><span class="lines">@@ -56,16 +53,22 @@
</span><span class="cx"> @property
</span><span class="cx"> def siblingExtensionSearch(self):
</span><span class="cx"> """
</span><del>- Dynamically create a version of L{_FilePath.siblingExtensionSearch} that
- uses a pluggable 'listdir' implementation.
</del><ins>+ Dynamically create a version of L{_FilePath.siblingExtensionSearch}
+ that uses a pluggable L{listdir} implementation.
</ins><span class="cx"> """
</span><del>- return MethodType(FunctionType(
</del><ins>+ return MethodType(
+ FunctionType(
</ins><span class="cx"> _FilePath.siblingExtensionSearch.im_func.func_code,
</span><del>- {'listdir': self._retryListdir,
- 'basename': _basename,
- 'dirname': _dirname,
- 'joinpath': _joinpath,
- 'exists': _exists}), self, self.__class__)
</del><ins>+ {
+ "listdir": self._retryListdir,
+ "basename": basename,
+ "dirname": dirname,
+ "joinpath": join,
+ "exists": exists
+ }
+ ),
+ self, self.__class__
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def changed(self):
</span><span class="lines">@@ -84,6 +87,7 @@
</span><span class="cx"> C{siblingExtensionSearch}.
</span><span class="cx"> """
</span><span class="cx"> delay = 0.1
</span><ins>+
</ins><span class="cx"> while True:
</span><span class="cx"> try:
</span><span class="cx"> return self._listdir(pathname)
</span><span class="lines">@@ -93,9 +97,10 @@
</span><span class="cx"> delay = min(self.BACKOFF_MAX, delay * 2.0)
</span><span class="cx"> else:
</span><span class="cx"> raise
</span><del>- raise RuntimeError("unreachable code.")
</del><span class="cx">
</span><ins>+ raise AssertionError("unreachable code.")
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def listdir(self):
</span><span class="cx"> """
</span><span class="cx"> List the directory which C{self.path} points to, compensating for
</span><span class="lines">@@ -126,9 +131,11 @@
</span><span class="cx"> """
</span><span class="cx"> result = super(CachingFilePath, self).moveTo(destination, followLinks)
</span><span class="cx"> self.changed()
</span><del>- # Work with vanilla FilePath destinations to pacify the tests.
</del><ins>+
+ # Work with vanilla FilePath destinations to pacify the tests.
</ins><span class="cx"> if hasattr(destination, "changed"):
</span><span class="cx"> destination.changed()
</span><ins>+
</ins><span class="cx"> return result
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -142,6 +149,6 @@
</span><span class="cx"> finally:
</span><span class="cx"> self.changed()
</span><span class="cx">
</span><ins>+
+
</ins><span class="cx"> CachingFilePath.clonePath = CachingFilePath
</span><del>-
-__all__ = ["CachingFilePath"]
</del></span></pre>
</div>
</div>
</body>
</html>