<!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>[12156] twext/trunk/twext/who</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/12156">12156</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 14:56:15 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Pull in methods from ConstantsContainer sources.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhotesttest_utilpy">twext/trunk/twext/who/test/test_util.py</a></li>
<li><a href="#twexttrunktwextwhoutilpy">twext/trunk/twext/who/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhotesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_util.py (12155 => 12156)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_util.py 2013-12-19 22:36:09 UTC (rev 12155)
+++ twext/trunk/twext/who/test/test_util.py 2013-12-19 22:56:15 UTC (rev 12156)
</span><span class="lines">@@ -32,18 +32,27 @@
</span><span class="cx">
</span><span class="cx"> class Tools(Names):
</span><span class="cx"> hammer = NamedConstant()
</span><ins>+ hammer.description = u"nail pounder"
+
</ins><span class="cx"> screwdriver = NamedConstant()
</span><del>-
- hammer.description = u"nail pounder"
</del><span class="cx"> screwdriver.description = u"screw twister"
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @staticmethod
+ def isPounder(tool):
+ if getattr(tool, "description", "").endswith("pounder"):
+ return True
+ return False
+
+
</ins><span class="cx"> class MoreTools(Names):
</span><span class="cx"> saw = NamedConstant()
</span><del>-
</del><span class="cx"> saw.description = u"z maker"
</span><span class="cx">
</span><ins>+ mallet = NamedConstant()
+ mallet.description = u"soft pounder"
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class Instruments(Names):
</span><span class="cx"> hammer = NamedConstant()
</span><span class="cx"> chisel = NamedConstant()
</span><span class="lines">@@ -145,6 +154,17 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def test_staticmethod(self):
+ """
+ Static methods from source containers are accessible via attributes.
+ """
+ container = ConstantsContainer((Tools, MoreTools))
+ self.assertTrue(container.isPounder(container.hammer))
+ self.assertTrue(container.isPounder(container.mallet))
+ self.assertFalse(container.isPounder(container.screwdriver))
+ self.assertFalse(container.isPounder(container.saw))
+
+
</ins><span class="cx"> def test_lookupByName(self):
</span><span class="cx"> """
</span><span class="cx"> Constants are assessible via L{ConstantsContainer.lookupByName}.
</span></span></pre></div>
<a id="twexttrunktwextwhoutilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/util.py (12155 => 12156)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/util.py 2013-12-19 22:36:09 UTC (rev 12155)
+++ twext/trunk/twext/who/util.py 2013-12-19 22:56:15 UTC (rev 12156)
</span><span class="lines">@@ -40,21 +40,19 @@
</span><span class="cx"> """
</span><span class="cx"> def __init__(self, sources):
</span><span class="cx"> self._constants = {}
</span><ins>+ self._methods = {}
</ins><span class="cx">
</span><span class="cx"> for source in sources:
</span><span class="cx"> if type(source) is type:
</span><del>- if issubclass(
- source, (ConstantsContainer, Names, Values, Flags)
- ):
</del><ins>+ if issubclass(source, CONTAINER_CLASSES):
</ins><span class="cx"> self._addConstants(source.iterconstants())
</span><ins>+ self._addMethods(source)
</ins><span class="cx"> else:
</span><span class="cx"> raise TypeError(
</span><span class="cx"> "Unknown constants type: {0}".format(source)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- elif isinstance(
- source, (NamedConstant, ValueConstant, FlagConstant)
- ):
</del><ins>+ elif isinstance(source, CONSTANT_CLASSES):
</ins><span class="cx"> self._addConstants((source,))
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="lines">@@ -79,13 +77,27 @@
</span><span class="cx"> self._constants[constant.name] = constant
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def _addMethods(self, container):
+ for name, value in container.__dict__.iteritems():
+ if type(value) is staticmethod:
+ if name in self._constants or name in self._methods:
+ raise ValueError("Name conflict: {0}".format(name))
+
+ self._methods[name] = getattr(container, name)
+
+
</ins><span class="cx"> def __getattr__(self, name):
</span><del>- try:
- return self._constants[name]
- except KeyError:
- raise AttributeError(name)
</del><ins>+ attr = self._constants.get(name, None)
+ if attr is not None:
+ return attr
</ins><span class="cx">
</span><ins>+ attr = self._methods.get(name, None)
+ if attr is not None:
+ return attr
</ins><span class="cx">
</span><ins>+ raise AttributeError(name)
+
+
</ins><span class="cx"> def iterconstants(self):
</span><span class="cx"> return self._constants.itervalues()
</span><span class="cx">
</span><span class="lines">@@ -129,3 +141,8 @@
</span><span class="cx"> # Work around http://twistedmatrix.com/trac/ticket/6302
</span><span class="cx"> # FIXME: This depends on a private attribute (flags._container)
</span><span class="cx"> return (flags._container.lookupByName(name) for name in flags.names)
</span><ins>+
+
+
+CONTAINER_CLASSES = (ConstantsContainer, Names, Values, Flags)
+CONSTANT_CLASSES = (NamedConstant, ValueConstant, FlagConstant)
</ins></span></pre>
</div>
</div>
</body>
</html>