[prev in list] [next in list] [prev in thread] [next in thread] 

List:       calendarserver-changes
Subject:    [CalendarServer-changes] [15250] twext/trunk
From:       source_changes () macosforge ! org
Date:       2015-10-29 19:02:31
Message-ID: 20151029190231.6C60E140E38 () svn ! calendarserver ! org
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


Revision: 15250
          http://trac.calendarserver.org//changeset/15250
Author:   cdaboo@apple.com
Date:     2015-10-29 12:02:31 -0700 (Thu, 29 Oct 2015)
Log Message:
-----------
Whitespace.

Modified Paths:
--------------
    twext/trunk/setup.py
    twext/trunk/twext/internet/socketfile.py
    twext/trunk/twext/who/ldap/_service.py
    twext/trunk/twext/who/ldap/test/test_service.py
    twext/trunk/twext/who/opendirectory/_service.py
    twext/trunk/twext/who/opendirectory/test/test_service.py

Modified: twext/trunk/setup.py
===================================================================
--- twext/trunk/setup.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/setup.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -52,6 +52,7 @@
     return modules
 
 
+
 def svn_info(wc_path):
     """
     Look up info on a Subversion working copy.
@@ -87,6 +88,7 @@
     )
 
 
+
 def svn_status(wc_path):
     """
     Look up status on a Subversion working copy.
@@ -127,6 +129,7 @@
         yield dict(path=path)
 
 
+
 def version():
     """
     Compute the version number.
@@ -275,6 +278,7 @@
         pass
 
 
+
 #
 # Run setup
 #

Modified: twext/trunk/twext/internet/socketfile.py
===================================================================
--- twext/trunk/twext/internet/socketfile.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/internet/socketfile.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -41,6 +41,7 @@
     self.realDoRead()
 
 
+
 class MaxAcceptSocketFileServer(service.Service):
     """
     Socket File server

Modified: twext/trunk/twext/who/ldap/_service.py
===================================================================
--- twext/trunk/twext/who/ldap/_service.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/ldap/_service.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -877,7 +877,7 @@
                             if not isinstance(values, list):
                                 values = [values]
 
-                            attribute, attributeValue, fieldValue = attributeRule.split(":")
+                            _ignore_attribute, attributeValue, fieldValue = attributeRule.split(":")
 
                             for value in values:
                                 if value == attributeValue:

Modified: twext/trunk/twext/who/ldap/test/test_service.py
===================================================================
--- twext/trunk/twext/who/ldap/test/test_service.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/ldap/test/test_service.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -102,6 +102,7 @@
     three.description = u"three"
 
 
+
 class TestFieldName(Names):
     multiChoice = NamedConstant()
     multiChoice.description = u"Multiple Choice Test Field"
@@ -151,7 +152,6 @@
 
 
 
-
 class TestService(DirectoryService, QueryMixIn):
     pass
 
@@ -494,6 +494,7 @@
         self.assertEquals(len(service.connections), 0)
 
 
+
 class ExtraFiltersTest(BaseTestCase, unittest.TestCase):
 
     def test_extraFilters(self):
@@ -516,6 +517,8 @@
             service._addExtraFilter(RecordType.group, "(bar=2)")
         )
 
+
+
 class RecordsFromReplyTest(BaseTestCase, unittest.TestCase):
 
     def test_boolean(self):
@@ -630,6 +633,7 @@
         self.assertEquals(records[2].fullNames, ["cn-name"])
 
 
+
 def mockDirectoryDataFromXMLService(service):
     dc0 = u"org"
     dc1 = u"calendarserver"

Modified: twext/trunk/twext/who/opendirectory/_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/_service.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/opendirectory/_service.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -230,7 +230,6 @@
             cls._resetAutoreleasePool()
 
 
-
     @property
     def nodeName(self):
         return self._nodeName

Modified: twext/trunk/twext/who/opendirectory/test/test_service.py
===================================================================
--- twext/trunk/twext/who/opendirectory/test/test_service.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py	2015-10-29 19:02:31 UTC (rev 15250)
@@ -38,6 +38,7 @@
     def setUp(self):
         self.service = DirectoryService()
 
+
     def tearDown(self):
         self.service._deletePool()
 

[Attachment #5 (text/html)]

<!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>[15250] twext/trunk</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/15250">15250</a></dd> <dt>Author</dt> \
<dd>cdaboo@apple.com</dd> <dt>Date</dt> <dd>2015-10-29 12:02:31 -0700 (Thu, 29 Oct \
2015)</dd> </dl>

<h3>Log Message</h3>
<pre>Whitespace.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunksetuppy">twext/trunk/setup.py</a></li>
<li><a href="#twexttrunktwextinternetsocketfilepy">twext/trunk/twext/internet/socketfile.py</a></li>
 <li><a href="#twexttrunktwextwholdap_servicepy">twext/trunk/twext/who/ldap/_service.py</a></li>
 <li><a href="#twexttrunktwextwholdaptesttest_servicepy">twext/trunk/twext/who/ldap/test/test_service.py</a></li>
 <li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
 <li><a href="#twexttrunktwextwhoopendirectorytesttest_servicepy">twext/trunk/twext/who/opendirectory/test/test_service.py</a></li>
 </ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunksetuppy"></a>
<div class="modfile"><h4>Modified: twext/trunk/setup.py (15249 => 15250)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/setup.py	2015-10-29 14:58:52 UTC (rev 15249)
+++ twext/trunk/setup.py	2015-10-29 19:02:31 UTC (rev 15250)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">     return modules
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def svn_info(wc_path):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Look up info on a Subversion working copy.
</span><span class="lines">@@ -87,6 +88,7 @@
</span><span class="cx">     )
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def svn_status(wc_path):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Look up status on a Subversion working copy.
</span><span class="lines">@@ -127,6 +129,7 @@
</span><span class="cx">         yield dict(path=path)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def version():
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Compute the version number.
</span><span class="lines">@@ -275,6 +278,7 @@
</span><span class="cx">         pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> #
</span><span class="cx"> # Run setup
</span><span class="cx"> #
</span></span></pre></div>
<a id="twexttrunktwextinternetsocketfilepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/internet/socketfile.py (15249 => \
15250)</h4> <pre class="diff"><span>
<span class="info">--- twext/trunk/twext/internet/socketfile.py	2015-10-29 14:58:52 \
                UTC (rev 15249)
+++ twext/trunk/twext/internet/socketfile.py	2015-10-29 19:02:31 UTC (rev 15250)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx">     self.realDoRead()
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class MaxAcceptSocketFileServer(service.Service):
</span><span class="cx">     &quot;&quot;&quot;
</span><span class="cx">     Socket File server
</span></span></pre></div>
<a id="twexttrunktwextwholdap_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/_service.py (15249 => \
15250)</h4> <pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/_service.py	2015-10-29 14:58:52 UTC \
                (rev 15249)
+++ twext/trunk/twext/who/ldap/_service.py	2015-10-29 19:02:31 UTC (rev 15250)
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx">                             if not isinstance(values, list):
</span><span class="cx">                                 values = [values]
</span><span class="cx"> 
</span><del>-                            attribute, attributeValue, fieldValue = \
attributeRule.split(&quot;:&quot;) </del><ins>+                            \
_ignore_attribute, attributeValue, fieldValue = attributeRule.split(&quot;:&quot;) \
</ins><span class="cx">  </span><span class="cx">                             for \
value in values: </span><span class="cx">                                 if value == \
attributeValue: </span></span></pre></div>
<a id="twexttrunktwextwholdaptesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/ldap/test/test_service.py \
(15249 => 15250)</h4> <pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/ldap/test/test_service.py	2015-10-29 \
                14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/ldap/test/test_service.py	2015-10-29 19:02:31 UTC (rev \
15250) </span><span class="lines">@@ -102,6 +102,7 @@
</span><span class="cx">     three.description = u&quot;three&quot;
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class TestFieldName(Names):
</span><span class="cx">     multiChoice = NamedConstant()
</span><span class="cx">     multiChoice.description = u&quot;Multiple Choice Test \
Field&quot; </span><span class="lines">@@ -151,7 +152,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx"> class TestService(DirectoryService, QueryMixIn):
</span><span class="cx">     pass
</span><span class="cx"> 
</span><span class="lines">@@ -494,6 +494,7 @@
</span><span class="cx">         self.assertEquals(len(service.connections), 0)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> class ExtraFiltersTest(BaseTestCase, unittest.TestCase):
</span><span class="cx"> 
</span><span class="cx">     def test_extraFilters(self):
</span><span class="lines">@@ -516,6 +517,8 @@
</span><span class="cx">             service._addExtraFilter(RecordType.group, \
&quot;(bar=2)&quot;) </span><span class="cx">         )
</span><span class="cx"> 
</span><ins>+
+
</ins><span class="cx"> class RecordsFromReplyTest(BaseTestCase, unittest.TestCase):
</span><span class="cx"> 
</span><span class="cx">     def test_boolean(self):
</span><span class="lines">@@ -630,6 +633,7 @@
</span><span class="cx">         self.assertEquals(records[2].fullNames, \
[&quot;cn-name&quot;]) </span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> def mockDirectoryDataFromXMLService(service):
</span><span class="cx">     dc0 = u&quot;org&quot;
</span><span class="cx">     dc1 = u&quot;calendarserver&quot;
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py \
(15249 => 15250)</h4> <pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py	2015-10-29 \
                14:58:52 UTC (rev 15249)
+++ twext/trunk/twext/who/opendirectory/_service.py	2015-10-29 19:02:31 UTC (rev \
15250) </span><span class="lines">@@ -230,7 +230,6 @@
</span><span class="cx">             cls._resetAutoreleasePool()
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
</del><span class="cx">     @property
</span><span class="cx">     def nodeName(self):
</span><span class="cx">         return self._nodeName
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: \
twext/trunk/twext/who/opendirectory/test/test_service.py (15249 => 15250)</h4> <pre \
class="diff"><span> <span class="info">--- \
twext/trunk/twext/who/opendirectory/test/test_service.py	2015-10-29 14:58:52 UTC (rev \
                15249)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py	2015-10-29 19:02:31 UTC \
(rev 15250) </span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">     def setUp(self):
</span><span class="cx">         self.service = DirectoryService()
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx">     def tearDown(self):
</span><span class="cx">         self.service._deletePool()
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>



_______________________________________________
calendarserver-changes mailing list
calendarserver-changes@lists.macosforge.org
https://lists.macosforge.org/mailman/listinfo/calendarserver-changes


[prev in list] [next in list] [prev in thread] [next in thread]