<!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>[12093] CalendarServer/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/12093">12093</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-13 16:33:05 -0800 (Fri, 13 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stop being soft on ctypes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunkpyflakes">CalendarServer/trunk/pyflakes</a></li>
<li><a href="#CalendarServertrunktwistedcaldavutilpy">CalendarServer/trunk/twistedcaldav/util.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunkpyflakes"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/pyflakes (12092 => 12093)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/pyflakes        2013-12-14 00:25:35 UTC (rev 12092)
+++ CalendarServer/trunk/pyflakes        2013-12-14 00:33:05 UTC (rev 12093)
</span><span class="lines">@@ -19,9 +19,8 @@
</span><span class="cx"> 
</span><span class="cx"> tmp=&quot;$(mktemp &quot;/tmp/pyflakes.XXXXX&quot;)&quot;;
</span><span class="cx"> 
</span><del>-cd &quot;${wd}&quot; &amp;&amp; &quot;${pyflakes}&quot; &quot;$@&quot; | sed                                    \
-  -e &quot;/'from ctypes import \\*' used; unable to detect undefined names/d&quot; \
-  -e &quot;/xmlext.py:[0-9][0-9]*: /d&quot;                                         \
</del><ins>+cd &quot;${wd}&quot; &amp;&amp; &quot;${pyflakes}&quot; &quot;$@&quot; | sed  \
+  -e &quot;/xmlext.py:[0-9][0-9]*: /d&quot;       \
</ins><span class="cx">   | tee &quot;${tmp}&quot;;
</span><span class="cx"> 
</span><span class="cx"> if [ -s &quot;${tmp}&quot; ]; then error=&quot;true&quot;; else error=&quot;false&quot;; fi;
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/util.py (12092 => 12093)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/util.py        2013-12-14 00:25:35 UTC (rev 12092)
+++ CalendarServer/trunk/twistedcaldav/util.py        2013-12-14 00:33:05 UTC (rev 12093)
</span><span class="lines">@@ -35,14 +35,20 @@
</span><span class="cx"> ##
</span><span class="cx"> 
</span><span class="cx"> try:
</span><del>-    from ctypes import *
-    import ctypes.util
</del><ins>+    from ctypes import (
+        cdll,
+        c_int, c_uint64, c_ulong,
+        c_char_p, c_void_p,
+        addressof, sizeof, c_size_t,
+        connect,
+    )
+    from ctypes.util import find_library
</ins><span class="cx">     hasCtypes = True
</span><span class="cx"> except ImportError:
</span><span class="cx">     hasCtypes = False
</span><span class="cx"> 
</span><span class="cx"> if sys.platform == &quot;darwin&quot; and hasCtypes:
</span><del>-    libc = cdll.LoadLibrary(ctypes.util.find_library(&quot;libc&quot;))
</del><ins>+    libc = cdll.LoadLibrary(find_library(&quot;libc&quot;))
</ins><span class="cx"> 
</span><span class="cx">     def getNCPU():
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -56,8 +62,8 @@
</span><span class="cx">         ]
</span><span class="cx">         libc.sysctlbyname(
</span><span class="cx">             &quot;hw.ncpu&quot;,
</span><del>-            c_voidp(addressof(ncpu)),
-            c_voidp(addressof(size)),
</del><ins>+            c_void_p(addressof(ncpu)),
+            c_void_p(addressof(size)),
</ins><span class="cx">             None,
</span><span class="cx">             0
</span><span class="cx">         )
</span><span class="lines">@@ -77,8 +83,8 @@
</span><span class="cx">         ]
</span><span class="cx">         libc.sysctlbyname(
</span><span class="cx">             &quot;hw.memsize&quot;,
</span><del>-            c_voidp(addressof(memsize)),
-            c_voidp(addressof(size)),
</del><ins>+            c_void_p(addressof(memsize)),
+            c_void_p(addressof(size)),
</ins><span class="cx">             None,
</span><span class="cx">             0
</span><span class="cx">         )
</span><span class="lines">@@ -87,7 +93,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> elif sys.platform == &quot;linux2&quot; and hasCtypes:
</span><del>-    libc = cdll.LoadLibrary(ctypes.util.find_library(&quot;libc&quot;))
</del><ins>+    libc = cdll.LoadLibrary(find_library(&quot;libc&quot;))
</ins><span class="cx"> 
</span><span class="cx">     def getNCPU():
</span><span class="cx">         return libc.get_nprocs()
</span></span></pre>
</div>
</div>

</body>
</html>