<!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>[14899] twext/branches/users/cdaboo/cfod</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/14899">14899</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2015-06-18 07:58:26 -0700 (Thu, 18 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Checkpoint of cffi/OD work.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twextbranchesuserscdaboocfodproject">twext/branches/users/cdaboo/cfod/.project</a></li>
<li><a href="#twextbranchesuserscdaboocfodsetuppy">twext/branches/users/cdaboo/cfod/setup.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextwhoopendirectory_servicepy">twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextwhoopendirectorytesttest_servicepy">twext/branches/users/cdaboo/cfod/twext/who/opendirectory/test/test_service.py</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>twext/branches/users/cdaboo/cfod/twext/platform/</li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatform__init__py">twext/branches/users/cdaboo/cfod/twext/platform/__init__.py</a></li>
<li>twext/branches/users/cdaboo/cfod/twext/platform/osx/</li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosx__init__py">twext/branches/users/cdaboo/cfod/twext/platform/osx/__init__.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosx_corefoundation_cffi_buildpy">twext/branches/users/cdaboo/cfod/twext/platform/osx/_corefoundation_cffi_build.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxcorefoundationpy">twext/branches/users/cdaboo/cfod/twext/platform/osx/corefoundation.py</a></li>
<li>twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/</li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxframeworks__init__py">twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/__init__.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxframeworks_corefoundation_cffipy">twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_corefoundation_cffi.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxframeworks_opendirectory_cffipy">twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_opendirectory_cffi.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxframeworks_utils_cffipy">twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_utils_cffi.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxopendirectorypy">twext/branches/users/cdaboo/cfod/twext/platform/osx/opendirectory.py</a></li>
<li>twext/branches/users/cdaboo/cfod/twext/platform/osx/test/</li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtest__init__py">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/__init__.py</a></li>
<li>twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/</li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtestdatabinary_fmtplist">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/binary_fmt.plist</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtestdataxml_fmtplist">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/xml_fmt.plist</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfarraypy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfarray.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfdatapy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdata.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfdictionarypy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdictionary.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cflocalepy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cflocale.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfpropertylistpy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfpropertylist.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfstringpy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfstring.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_cftimezonepy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cftimezone.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxtesttest_opendirectorypy">twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_opendirectory.py</a></li>
<li><a href="#twextbranchesuserscdaboocfodtwextplatformosxutilspy">twext/branches/users/cdaboo/cfod/twext/platform/osx/utils.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#twextbranchesuserscdaboocfodtwextwhoopendirectory_odframeworkpy">twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_odframework.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twextbranchesuserscdaboocfodproject"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/cfod/.project (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/.project 2015-06-17 16:25:23 UTC (rev 14898)
+++ twext/branches/users/cdaboo/cfod/.project 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -3,7 +3,6 @@
</span><span class="cx"> <name>twextpy</name>
</span><span class="cx"> <comment></comment>
</span><span class="cx"> <projects>
</span><del>- <project>cffi</project>
</del><span class="cx"> <project>python-ldap</project>
</span><span class="cx"> <project>sqlparse</project>
</span><span class="cx"> <project>Twisted</project>
</span></span></pre></div>
<a id="twextbranchesuserscdaboocfodsetuppy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/cfod/setup.py (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/setup.py 2015-06-17 16:25:23 UTC (rev 14898)
+++ twext/branches/users/cdaboo/cfod/setup.py 2015-06-18 14:58:26 UTC (rev 14899)
</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"> """
</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"> """
</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"> """
</span><span class="cx"> Compute the version number.
</span><span class="lines">@@ -235,8 +238,12 @@
</span><span class="cx">
</span><span class="cx"> setup_requirements = []
</span><span class="cx">
</span><ins>+cffi_requirements = [
+ "twext/platform/osx/_corefoundation_cffi_build.py:ffi",
+]
+
</ins><span class="cx"> install_requirements = [
</span><del>- "cffi>=0.6",
</del><ins>+ "cffi>=1.1.0",
</ins><span class="cx"> "twisted>=15.2.0",
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="lines">@@ -248,7 +255,7 @@
</span><span class="cx"> "LDAP": ["python-ldap"],
</span><span class="cx">
</span><span class="cx"> # OpenDirectory
</span><del>- "OpenDirectory": ["pyobjc-framework-OpenDirectory"],
</del><ins>+ "OpenDirectory": ["cffi>=1.1.0"],
</ins><span class="cx">
</span><span class="cx"> # Oracle
</span><span class="cx"> "Oracle": ["cx_Oracle"],
</span><span class="lines">@@ -275,6 +282,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 class="lines">@@ -313,6 +321,7 @@
</span><span class="cx"> ext_modules=extensions,
</span><span class="cx"> py_modules=[],
</span><span class="cx"> setup_requires=setup_requirements,
</span><ins>+ cffi_modules=cffi_requirements,
</ins><span class="cx"> install_requires=install_requirements,
</span><span class="cx"> extras_require=extras_requirements,
</span><span class="cx"> )
</span></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatform__init__py"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/__init__.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/__init__.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/__init__.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosx__init__py"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/__init__.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/__init__.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/__init__.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosx_corefoundation_cffi_buildpy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/_corefoundation_cffi_build.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/_corefoundation_cffi_build.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/_corefoundation_cffi_build.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+
+from cffi import FFI
+from importlib import import_module
+
+# Load cffi declaration modules
+modules = [import_module(".frameworks.{}".format(module), "twext.platform.osx") for module in (
+ "_corefoundation_cffi",
+ "_opendirectory_cffi",
+ "_utils_cffi",
+)]
+
+# Build list of includes and extra link arguments from each module
+includes = "".join([m.INCLUDES for m in modules])
+extra_links = []
+for m in modules:
+ extra_links.extend(m.EXTRA_LINKS)
+
+# Build cffi - all modules go into one python extension module
+ffi = FFI()
+ffi.set_source(
+ "_corefoundation",
+ includes,
+ extra_link_args=extra_links,
+)
+
+# Add each module's details
+for m in modules:
+ ffi.cdef(m.TYPES + m.CONSTANTS + m.FUNCTIONS)
+
+if __name__ == "__main__":
+ ffi.compile()
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxcorefoundationpy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/corefoundation.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/corefoundation.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/corefoundation.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,390 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+A set of Python classes that wrap common CoreFoundation classes.
+"""
+
+from ._corefoundation import ffi, lib as cf
+
+
+class CFError(Exception):
+ """
+ Generic CoreFoundation error occurred
+ """
+
+
+
+class CFObjectRef(object):
+ """
+ This is a wrapper for any CF objects returned from CFFI calls. For CF
+ objects whose ownership is implicitly retained (CoreFoundation Create Rule),
+ this class by default will CFRelease them. For an unowned object
+ (CoreFoundation Get Rule), the L{owned} parameter must be set to False,
+ which will cause the CF object to be explicitly CFRetain'd (and then
+ automatically released).
+ """
+
+ def __init__(self, cfobj, owned=True):
+ """
+ Create a wrapper around the supplied cffi object that mirrors a CoreFoundation object.
+
+ NB we have to cache the L{lib} and L{ffi} objects here to prevent them from being
+ garbage collected before this object's __del__ is called.
+
+ @param cfobj: the cffi object to wrap
+ @type cfobj: L{ffi.CData}
+ @param owned: whether the object is already retained
+ @type owned: L{bool}
+ """
+ self.cf = cf
+ self.ffi = ffi
+ self.cfobj = cfobj if cfobj is not None else ffi.NULL
+ if not owned and cfobj is not None:
+ cf.CFRetain(self.cfobj)
+
+
+ def __del__(self):
+ """
+ When this object is garbage collected, also release the CoreFoundation object, which we
+ know is retained by us.
+ """
+ if self.cfobj != self.ffi.NULL:
+ self.cf.CFRelease(self.cfobj)
+ self.cfobj = None
+ self.cf = None
+
+
+ def ref(self):
+ return self.cfobj
+
+
+ def retainCount(self):
+ return cf.CFGetRetainCount(self.ref())
+
+
+ def instanceTypeId(self):
+ return cf.CFGetTypeID(self.ref())
+
+
+ def description(self):
+ description = CFStringRef(cf.CFCopyDescription(self.ref()))
+ return description.toString()
+
+
+ def native(self):
+ """
+ Convert this object, if possible, into a native Python type. If it cannot be
+ converted, just return it as is.
+ """
+ if self.instanceTypeId() == CFStringRef.typeId():
+ item = CFStringRef(self.ref(), owned=False)
+ result = item.native()
+ elif self.instanceTypeId() == CFArrayRef.typeId():
+ item = CFArrayRef(self.ref(), owned=False)
+ result = item.native()
+ elif self.instanceTypeId() == CFDictionaryRef.typeId():
+ item = CFDictionaryRef(self.ref(), owned=False)
+ result = item.native()
+ else:
+ result = self
+
+ return result
+
+
+
+class CFErrorRef(CFObjectRef):
+ """
+ A wrapper for CFErrorRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFErrorGetTypeID()
+
+
+ def error(self):
+ """
+ Return the error description.
+
+ @return: error description
+ @rtype: L{str}
+ """
+ desc = CFStringRef(cf)
+ return desc.toString()
+
+
+
+class CFStringRef(CFObjectRef):
+ """
+ A wrapper for CFStringRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFStringGetTypeID()
+
+
+ @classmethod
+ def fromString(cls, text):
+ """
+ Create a cffi/CFStringRef from a Python L{str} - assume UTF-8 encoding.
+
+ @param text: utf-8 encoded string
+ @type text: L{str}
+
+ @return: the cffi data
+ @rtype: L{ffi.CData}
+ """
+ if isinstance(text, unicode):
+ text = text.encode("utf-8")
+ cfstringref = cf.CFStringCreateWithCString(ffi.NULL, text, cf.kCFStringEncodingUTF8)
+ if cfstringref == ffi.NULL:
+ raise CFError("Unable to create a CFStringRef")
+ return CFStringRef(cfstringref)
+
+
+ def toString(self):
+ return self.native()
+
+
+ def __str__(self):
+ return self.native()
+
+
+ def native(self):
+ """
+ Convert the cffi/CFStringRef value to a utf-8 encoded Python string.
+
+ @return: the string value
+ @rtype: L{str}
+ """
+ # Try quick conversion first, then try longer one
+ str = cf.CFStringGetCStringPtr(self.ref(), cf.kCFStringEncodingUTF8)
+ if str == ffi.NULL:
+ range = cf.CFStringGetLength(self.ref())
+ actualSize = ffi.new("CFIndex *")
+ cf.CFStringGetBytes(self.ref(), [0, range], cf.kCFStringEncodingUTF8, ord("?"), False, ffi.NULL, 0, actualSize)
+ actualSize = actualSize[0]
+ str = ffi.new("char []", actualSize + 1)
+ cf.CFStringGetCString(self.ref(), str, actualSize + 1, cf.kCFStringEncodingUTF8)
+ return ffi.string(str) if str else ""
+
+
+ def copy(self):
+ return CFStringRef(cf.CFStringCreateCopy(ffi.NULL, self.ref()))
+
+
+
+class CFDataRef(CFObjectRef):
+ """
+ A wrapper for CFDataRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFDataGetTypeID()
+
+
+ @classmethod
+ def fromString(cls, text):
+ """
+ Convert a L{str} to a cffi/CFDataRef.
+
+ @param text: string to convert
+ @type text: L{str}
+
+ @return: the value
+ @rtype: L{CFDataRef}
+ """
+ cfdataref = cf.CFDataCreate(ffi.NULL, text, len(text))
+ if cfdataref == ffi.NULL:
+ raise CFError("Unable to create a CFDataRef")
+ return CFDataRef(cfdataref)
+
+
+ def toString(self):
+ return self.native()
+
+
+ def count(self):
+ """
+ The number of items in the wrapped CFArrayRef.
+
+ @return: the count
+ @rtype: L{int}
+ """
+ return cf.CFDataGetLength(self.ref())
+
+
+ def native(self):
+ """
+ Convert the cffi/CFDataRef value to a Python string.
+
+ @return: the string value
+ @rtype: L{str}
+ """
+ count = self.count()
+ value = ffi.new("UInt8 []", count)
+ cf.CFDataGetBytes(self.ref(), [0, count], value)
+ return bytes(ffi.buffer(value, count))
+
+
+
+class CFArrayRef(CFObjectRef):
+ """
+ A wrapper for CFArrayRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFArrayGetTypeID()
+
+
+ @classmethod
+ def fromList(cls, l):
+ """
+ Create a cffi/CFArrayRef from a Python L{list} of L{CFObjectRef}.
+
+ @param l: list to convert
+ @type l: L{list}
+
+ @return: the cffi data
+ @rtype: L{CFArrayRef}
+ """
+ lr = [item.ref() for item in l]
+ cfarrayref = cf.CFArrayCreate(ffi.NULL, lr, len(l), ffi.addressof(cf.kCFTypeArrayCallBacks))
+ if cfarrayref == ffi.NULL:
+ raise CFError("Unable to create a CFArrayRef")
+ return CFArrayRef(cfarrayref)
+
+
+ def toList(self):
+ return self.native()
+
+
+ def count(self):
+ """
+ The number of items in the wrapped CFArrayRef.
+
+ @return: the count
+ @rtype: L{int}
+ """
+ return cf.CFArrayGetCount(self.ref())
+
+
+ def valueAtIndex(self, index):
+ """
+ Return an item from the CFArrayRef, converted to native type.
+
+ @param index: index of item to return
+ @type index: L{int}
+
+ @return: the cffi data
+ @rtype: L{CFObjectRef}, L{str}, L{list} or L{dict}
+ """
+ result = cf.CFArrayGetValueAtIndex(self.ref(), index)
+ if result != ffi.NULL:
+ result = CFObjectRef(result, owned=False)
+ return result.native()
+ else:
+ return None
+
+
+ def native(self):
+ """
+ Convert a CFArrayRef into an L{list} of native items.
+
+ @return: list of native items
+ @rtype: L{list}
+ """
+ count = self.count()
+ values = ffi.new("const void * []", count)
+ cf.CFArrayGetValues(self.ref(), [0, count], values)
+ items = [CFObjectRef(item, owned=False) for item in values]
+ return [item.native() for item in items]
+
+
+
+class CFDictionaryRef(CFObjectRef):
+ """
+ A wrapper for CFDictionaryRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFDictionaryGetTypeID()
+
+
+ @classmethod
+ def fromDict(cls, d):
+ """
+ Create a cffi/CFDictionaryRef from a Python L{dict} of L{CFObjectRef}.
+
+ @param d: dict to convert
+ @type d: L{dict}
+
+ @return: the cffi data
+ @rtype: L{CFDictionaryRef}
+ """
+ keys = []
+ values = []
+ for k, v in d.items():
+ keys.append(k.ref())
+ values.append(v.ref())
+ cfdictref = cf.CFDictionaryCreate(
+ ffi.NULL, keys, values, len(keys),
+ ffi.addressof(cf.kCFTypeDictionaryKeyCallBacks),
+ ffi.addressof(cf.kCFTypeDictionaryValueCallBacks),
+ )
+ if cfdictref == ffi.NULL:
+ raise CFError("Unable to create a CFDictionaryRef")
+ return CFDictionaryRef(cfdictref)
+
+
+ def toDict(self):
+ return self.native()
+
+
+ def count(self):
+ """
+ The number of items in the wrapped CFDictionaryRef.
+
+ @return: the count
+ @rtype: L{int}
+ """
+ return cf.CFDictionaryGetCount(self.ref())
+
+
+ def native(self):
+ """
+ Convert the cffi/CFDictionaryRef value to a Python L{dict}. The keys and values
+ are all converted to their native values.
+
+ @return: the result
+ @rtype: L{dict}
+ """
+ count = self.count()
+ keys = ffi.new("const void * []", count)
+ values = ffi.new("const void * []", count)
+ cf.CFDictionaryGetKeysAndValues(self.ref(), keys, values)
+
+ result = {}
+ for key, value in zip(keys, values):
+ k = CFStringRef(key, owned=False)
+ v = CFObjectRef(value, owned=False)
+ result[k.native()] = v.native()
+ return result
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxframeworks__init__py"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/__init__.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/__init__.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/__init__.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+all = [
+ "_corefoundation_cffi",
+ "_opendirectory_cffi",
+ "_utils_cffi",
+]
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxframeworks_corefoundation_cffipy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_corefoundation_cffi.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_corefoundation_cffi.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_corefoundation_cffi.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,100 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+
+INCLUDES = """
+#include <CoreFoundation/CoreFoundation.h>
+"""
+
+EXTRA_LINKS = []
+
+TYPES = """
+typedef bool Boolean;
+typedef signed long OSStatus;
+typedef unsigned char UInt8;
+typedef uint32_t UInt32;
+
+typedef signed long CFIndex;
+typedef UInt32 CFOptionFlags;
+struct CFRange { CFIndex location; CFIndex length; };
+typedef struct CFRange CFRange;
+typedef UInt32 CFStringEncoding;
+typedef enum {
+ kCFStringEncodingUTF8 = 0x08000100, /* kTextEncodingUnicodeDefault + kUnicodeUTF8Format */
+};
+
+typedef unsigned long CFTypeID;
+typedef const void * CFTypeRef;
+typedef const struct __CFAllocator *CFAllocatorRef;
+typedef const struct __CFString *CFStringRef;
+typedef const struct __CFData *CFDataRef;
+typedef const struct __CFArray *CFArrayRef;
+typedef const struct __CFDictionary *CFDictionaryRef;
+typedef struct __CFError * CFErrorRef;
+
+typedef struct {
+ ...;
+} CFArrayCallBacks;
+
+typedef struct {
+ ...;
+} CFDictionaryKeyCallBacks;
+typedef struct {
+ ...;
+} CFDictionaryValueCallBacks;
+"""
+
+CONSTANTS = """
+const CFArrayCallBacks kCFTypeArrayCallBacks;
+
+const CFDictionaryKeyCallBacks kCFTypeDictionaryKeyCallBacks;
+const CFDictionaryValueCallBacks kCFTypeDictionaryValueCallBacks;
+"""
+
+FUNCTIONS = """
+CFTypeRef CFRetain ( CFTypeRef cf );
+void CFRelease ( CFTypeRef cf );
+CFIndex CFGetRetainCount ( CFTypeRef cf );
+CFTypeID CFGetTypeID ( CFTypeRef cf );
+
+CFStringRef CFCopyDescription ( CFTypeRef cf );
+
+CFTypeID CFErrorGetTypeID ( void );
+
+CFTypeID CFStringGetTypeID ( void );
+CFStringRef CFStringCreateCopy ( CFAllocatorRef alloc, CFStringRef theString );
+CFStringRef CFStringCreateWithCString ( CFAllocatorRef alloc, const char *cStr, CFStringEncoding encoding );
+CFIndex CFStringGetBytes ( CFStringRef theString, CFRange range, CFStringEncoding encoding, UInt8 lossByte, Boolean isExternalRepresentation, UInt8 *buffer, CFIndex maxBufLen, CFIndex *usedBufLen );
+Boolean CFStringGetCString ( CFStringRef theString, char *buffer, CFIndex bufferSize, CFStringEncoding encoding );
+const char * CFStringGetCStringPtr ( CFStringRef theString, CFStringEncoding encoding );
+CFIndex CFStringGetLength ( CFStringRef theString );
+
+CFTypeID CFDataGetTypeID ( void );
+CFDataRef CFDataCreate ( CFAllocatorRef allocator, const UInt8 *bytes, CFIndex length );
+void CFDataGetBytes ( CFDataRef theData, CFRange range, UInt8 *buffer );
+CFIndex CFDataGetLength ( CFDataRef theData );
+
+CFTypeID CFArrayGetTypeID ( void );
+CFArrayRef CFArrayCreate ( CFAllocatorRef allocator, const void **values, CFIndex numValues, const CFArrayCallBacks *callBacks );
+CFIndex CFArrayGetCount ( CFArrayRef theArray );
+const void * CFArrayGetValueAtIndex ( CFArrayRef theArray, CFIndex idx );
+void CFArrayGetValues ( CFArrayRef theArray, CFRange range, const void **values );
+
+CFTypeID CFDictionaryGetTypeID ( void );
+CFDictionaryRef CFDictionaryCreate ( CFAllocatorRef allocator, const void **keys, const void **values, CFIndex numValues, const CFDictionaryKeyCallBacks *keyCallBacks, const CFDictionaryValueCallBacks *valueCallBacks );
+CFIndex CFDictionaryGetCount ( CFDictionaryRef theDict );
+void CFDictionaryGetKeysAndValues ( CFDictionaryRef theDict, const void **keys, const void **values );
+"""
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxframeworks_opendirectory_cffipy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_opendirectory_cffi.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_opendirectory_cffi.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_opendirectory_cffi.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,394 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+
+INCLUDES = """
+#include <OpenDirectory/OpenDirectory.h>
+"""
+
+EXTRA_LINKS = ["-framework", "OpenDirectory"]
+
+TYPES = """
+typedef struct __ODSession *ODSessionRef;
+typedef struct __ODNode *ODNodeRef;
+typedef struct __ODRecord *ODRecordRef;
+typedef struct __ODQuery *ODQueryRef;
+typedef uint32_t ODMatchType;
+typedef const struct __ODContext *ODContextRef;
+
+typedef CFStringRef ODRecordType;
+typedef CFStringRef ODAttributeType;
+typedef CFStringRef ODAuthenticationType;
+
+enum {
+ kODMatchAny = 0x0001,
+ kODMatchEqualTo = 0x2001,
+ kODMatchBeginsWith = 0x2002,
+ kODMatchEndsWith = 0x2003,
+ kODMatchContains = 0x2004,
+ kODMatchGreaterThan = 0x2006,
+ kODMatchLessThan = 0x2007
+ //kODMatchInsensitiveEqualTo = 0x2101,
+ //kODMatchInsensitiveBeginsWith = 0x2102,
+ //kODMatchInsensitiveEndsWith = 0x2103,
+ //kODMatchInsensitiveContains = 0x2104
+};
+
+"""
+
+CONSTANTS = """
+ODSessionRef kODSessionDefault;
+
+const ODRecordType kODRecordTypeAttributeTypes;
+const ODRecordType kODRecordTypeAFPServer;
+const ODRecordType kODRecordTypeAliases;
+const ODRecordType kODRecordTypeAugments;
+const ODRecordType kODRecordTypeAutomount;
+const ODRecordType kODRecordTypeAutomountMap;
+const ODRecordType kODRecordTypeAutoServerSetup;
+const ODRecordType kODRecordTypeBootp;
+const ODRecordType kODRecordTypeCertificateAuthorities;
+const ODRecordType kODRecordTypeComputerLists;
+const ODRecordType kODRecordTypeComputerGroups;
+const ODRecordType kODRecordTypeComputers;
+const ODRecordType kODRecordTypeConfiguration;
+const ODRecordType kODRecordTypeEthernets;
+const ODRecordType kODRecordTypeFileMakerServers;
+const ODRecordType kODRecordTypeFTPServer;
+const ODRecordType kODRecordTypeGroups;
+const ODRecordType kODRecordTypeHostServices;
+const ODRecordType kODRecordTypeHosts;
+const ODRecordType kODRecordTypeLDAPServer;
+const ODRecordType kODRecordTypeLocations;
+const ODRecordType kODRecordTypeMounts;
+const ODRecordType kODRecordTypeNFS;
+const ODRecordType kODRecordTypeNetDomains;
+const ODRecordType kODRecordTypeNetGroups;
+const ODRecordType kODRecordTypeNetworks;
+const ODRecordType kODRecordTypePeople;
+const ODRecordType kODRecordTypePresetComputers;
+const ODRecordType kODRecordTypePresetComputerGroups;
+const ODRecordType kODRecordTypePresetComputerLists;
+const ODRecordType kODRecordTypePresetGroups;
+const ODRecordType kODRecordTypePresetUsers;
+const ODRecordType kODRecordTypePrintService;
+const ODRecordType kODRecordTypePrintServiceUser;
+const ODRecordType kODRecordTypePrinters;
+const ODRecordType kODRecordTypeProtocols;
+const ODRecordType kODRecordTypeQTSServer;
+const ODRecordType kODRecordTypeQueryInformation;
+const ODRecordType kODRecordTypeRecordTypes;
+const ODRecordType kODRecordTypeResources;
+const ODRecordType kODRecordTypeRPC;
+const ODRecordType kODRecordTypeSMBServer;
+const ODRecordType kODRecordTypeServer;
+const ODRecordType kODRecordTypeServices;
+const ODRecordType kODRecordTypeSharePoints;
+const ODRecordType kODRecordTypeUsers;
+const ODRecordType kODRecordTypeWebServer;
+
+const ODAttributeType kODAttributeTypeAllAttributes;
+const ODAttributeType kODAttributeTypeStandardOnly;
+const ODAttributeType kODAttributeTypeNativeOnly;
+const ODAttributeType kODAttributeTypeMetaAmbiguousName;
+const ODAttributeType kODAttributeTypeMetaAugmentedAttributes;
+const ODAttributeType kODAttributeTypeMetaRecordName;
+const ODAttributeType kODAttributeTypeAdminLimits;
+const ODAttributeType kODAttributeTypeAltSecurityIdentities;
+const ODAttributeType kODAttributeTypeAuthenticationHint;
+const ODAttributeType kODAttributeTypeAllTypes;
+const ODAttributeType kODAttributeTypeAuthorityRevocationList;
+const ODAttributeType kODAttributeTypeBirthday;
+const ODAttributeType kODAttributeTypeCACertificate;
+const ODAttributeType kODAttributeTypeCapacity;
+const ODAttributeType kODAttributeTypeCertificateRevocationList;
+const ODAttributeType kODAttributeTypeComment;
+const ODAttributeType kODAttributeTypeContactGUID;
+const ODAttributeType kODAttributeTypeContactPerson;
+const ODAttributeType kODAttributeTypeCreationTimestamp;
+const ODAttributeType kODAttributeTypeCrossCertificatePair;
+const ODAttributeType kODAttributeTypeDataStamp;
+const ODAttributeType kODAttributeTypeFullName;
+const ODAttributeType kODAttributeTypeDNSDomain;
+const ODAttributeType kODAttributeTypeDNSNameServer;
+const ODAttributeType kODAttributeTypeENetAddress;
+const ODAttributeType kODAttributeTypeExpire;
+const ODAttributeType kODAttributeTypeFirstName;
+const ODAttributeType kODAttributeTypeGUID;
+const ODAttributeType kODAttributeTypeHardwareUUID;
+const ODAttributeType kODAttributeTypeHomeDirectoryQuota;
+const ODAttributeType kODAttributeTypeHomeDirectorySoftQuota;
+const ODAttributeType kODAttributeTypeHomeLocOwner;
+const ODAttributeType kODAttributeTypeInternetAlias;
+const ODAttributeType kODAttributeTypeKDCConfigData;
+const ODAttributeType kODAttributeTypeKerberosServices;
+const ODAttributeType kODAttributeTypeLastName;
+const ODAttributeType kODAttributeTypeLDAPSearchBaseSuffix;
+const ODAttributeType kODAttributeTypeLocation;
+const ODAttributeType kODAttributeTypeMapGUID;
+const ODAttributeType kODAttributeTypeMCXFlags;
+const ODAttributeType kODAttributeTypeMCXSettings;
+const ODAttributeType kODAttributeTypeMailAttribute;
+const ODAttributeType kODAttributeTypeMetaAutomountMap;
+const ODAttributeType kODAttributeTypeMiddleName;
+const ODAttributeType kODAttributeTypeModificationTimestamp;
+const ODAttributeType kODAttributeTypeNFSHomeDirectory;
+const ODAttributeType kODAttributeTypeNote;
+const ODAttributeType kODAttributeTypeOperatingSystem;
+const ODAttributeType kODAttributeTypeOperatingSystemVersion;
+const ODAttributeType kODAttributeTypeOwner;
+const ODAttributeType kODAttributeTypeOwnerGUID;
+const ODAttributeType kODAttributeTypePassword;
+const ODAttributeType kODAttributeTypePasswordPlus;
+const ODAttributeType kODAttributeTypePasswordPolicyOptions;
+const ODAttributeType kODAttributeTypePasswordServerList;
+const ODAttributeType kODAttributeTypePasswordServerLocation;
+const ODAttributeType kODAttributeTypePicture;
+const ODAttributeType kODAttributeTypePort;
+const ODAttributeType kODAttributeTypePresetUserIsAdmin;
+const ODAttributeType kODAttributeTypePrimaryComputerGUID;
+const ODAttributeType kODAttributeTypePrimaryComputerList;
+const ODAttributeType kODAttributeTypePrimaryGroupID;
+const ODAttributeType kODAttributeTypePrinter1284DeviceID;
+const ODAttributeType kODAttributeTypePrinterLPRHost;
+const ODAttributeType kODAttributeTypePrinterLPRQueue;
+const ODAttributeType kODAttributeTypePrinterMakeAndModel;
+const ODAttributeType kODAttributeTypePrinterType;
+const ODAttributeType kODAttributeTypePrinterURI;
+const ODAttributeType kODAttributeTypePrinterXRISupported;
+const ODAttributeType kODAttributeTypePrintServiceInfoText;
+const ODAttributeType kODAttributeTypePrintServiceInfoXML;
+const ODAttributeType kODAttributeTypePrintServiceUserData;
+const ODAttributeType kODAttributeTypeRealUserID;
+const ODAttributeType kODAttributeTypeRelativeDNPrefix;
+const ODAttributeType kODAttributeTypeSMBAcctFlags;
+const ODAttributeType kODAttributeTypeSMBGroupRID;
+const ODAttributeType kODAttributeTypeSMBHome;
+const ODAttributeType kODAttributeTypeSMBHomeDrive;
+const ODAttributeType kODAttributeTypeSMBKickoffTime;
+const ODAttributeType kODAttributeTypeSMBLogoffTime;
+const ODAttributeType kODAttributeTypeSMBLogonTime;
+const ODAttributeType kODAttributeTypeSMBPrimaryGroupSID;
+const ODAttributeType kODAttributeTypeSMBPWDLastSet;
+const ODAttributeType kODAttributeTypeSMBProfilePath;
+const ODAttributeType kODAttributeTypeSMBRID;
+const ODAttributeType kODAttributeTypeSMBScriptPath;
+const ODAttributeType kODAttributeTypeSMBSID;
+const ODAttributeType kODAttributeTypeSMBUserWorkstations;
+const ODAttributeType kODAttributeTypeServiceType;
+const ODAttributeType kODAttributeTypeSetupAdvertising;
+const ODAttributeType kODAttributeTypeSetupAutoRegister;
+const ODAttributeType kODAttributeTypeSetupLocation;
+const ODAttributeType kODAttributeTypeSetupOccupation;
+const ODAttributeType kODAttributeTypeTimeToLive;
+const ODAttributeType kODAttributeTypeTrustInformation;
+const ODAttributeType kODAttributeTypeUniqueID;
+const ODAttributeType kODAttributeTypeUserCertificate;
+const ODAttributeType kODAttributeTypeUserPKCS12Data;
+const ODAttributeType kODAttributeTypeUserShell;
+const ODAttributeType kODAttributeTypeUserSMIMECertificate;
+const ODAttributeType kODAttributeTypeVFSDumpFreq;
+const ODAttributeType kODAttributeTypeVFSLinkDir;
+const ODAttributeType kODAttributeTypeVFSPassNo;
+const ODAttributeType kODAttributeTypeVFSType;
+const ODAttributeType kODAttributeTypeWeblogURI;
+const ODAttributeType kODAttributeTypeXMLPlist;
+const ODAttributeType kODAttributeTypeProtocolNumber;
+const ODAttributeType kODAttributeTypeRPCNumber;
+const ODAttributeType kODAttributeTypeNetworkNumber;
+const ODAttributeType kODAttributeTypeAccessControlEntry;
+const ODAttributeType kODAttributeTypeAddressLine1;
+const ODAttributeType kODAttributeTypeAddressLine2;
+const ODAttributeType kODAttributeTypeAddressLine3;
+const ODAttributeType kODAttributeTypeAreaCode;
+const ODAttributeType kODAttributeTypeAuthenticationAuthority;
+const ODAttributeType kODAttributeTypeAutomountInformation;
+const ODAttributeType kODAttributeTypeBootParams;
+const ODAttributeType kODAttributeTypeBuilding;
+const ODAttributeType kODAttributeTypeServicesLocator;
+const ODAttributeType kODAttributeTypeCity;
+const ODAttributeType kODAttributeTypeCompany;
+const ODAttributeType kODAttributeTypeComputers;
+const ODAttributeType kODAttributeTypeCountry;
+const ODAttributeType kODAttributeTypeDepartment;
+const ODAttributeType kODAttributeTypeDNSName;
+const ODAttributeType kODAttributeTypeEMailAddress;
+const ODAttributeType kODAttributeTypeEMailContacts;
+const ODAttributeType kODAttributeTypeFaxNumber;
+const ODAttributeType kODAttributeTypeGroup;
+const ODAttributeType kODAttributeTypeGroupMembers;
+const ODAttributeType kODAttributeTypeGroupMembership;
+const ODAttributeType kODAttributeTypeGroupServices;
+const ODAttributeType kODAttributeTypeHomePhoneNumber;
+const ODAttributeType kODAttributeTypeHTML;
+const ODAttributeType kODAttributeTypeHomeDirectory;
+const ODAttributeType kODAttributeTypeIMHandle;
+const ODAttributeType kODAttributeTypeIPAddress;
+const ODAttributeType kODAttributeTypeIPAddressAndENetAddress;
+const ODAttributeType kODAttributeTypeIPv6Address;
+const ODAttributeType kODAttributeTypeJPEGPhoto;
+const ODAttributeType kODAttributeTypeJobTitle;
+const ODAttributeType kODAttributeTypeKDCAuthKey;
+const ODAttributeType kODAttributeTypeKeywords;
+const ODAttributeType kODAttributeTypeLDAPReadReplicas;
+const ODAttributeType kODAttributeTypeLDAPWriteReplicas;
+const ODAttributeType kODAttributeTypeMapCoordinates;
+const ODAttributeType kODAttributeTypeMapURI;
+const ODAttributeType kODAttributeTypeMIME;
+const ODAttributeType kODAttributeTypeMobileNumber;
+const ODAttributeType kODAttributeTypeNestedGroups;
+const ODAttributeType kODAttributeTypeNetGroups;
+const ODAttributeType kODAttributeTypeNickName;
+const ODAttributeType kODAttributeTypeOrganizationInfo;
+const ODAttributeType kODAttributeTypeOrganizationName;
+const ODAttributeType kODAttributeTypePagerNumber;
+const ODAttributeType kODAttributeTypePhoneContacts;
+const ODAttributeType kODAttributeTypePhoneNumber;
+const ODAttributeType kODAttributeTypePGPPublicKey;
+const ODAttributeType kODAttributeTypePostalAddress;
+const ODAttributeType kODAttributeTypePostalAddressContacts;
+const ODAttributeType kODAttributeTypePostalCode;
+const ODAttributeType kODAttributeTypeNamePrefix;
+const ODAttributeType kODAttributeTypeProfiles;
+const ODAttributeType kODAttributeTypeProfilesTimestamp;
+const ODAttributeType kODAttributeTypeProtocols;
+const ODAttributeType kODAttributeTypeRecordName;
+const ODAttributeType kODAttributeTypeRelationships;
+const ODAttributeType kODAttributeTypeResourceInfo;
+const ODAttributeType kODAttributeTypeResourceType;
+const ODAttributeType kODAttributeTypeState;
+const ODAttributeType kODAttributeTypeStreet;
+const ODAttributeType kODAttributeTypeNameSuffix;
+const ODAttributeType kODAttributeTypeURL;
+const ODAttributeType kODAttributeTypeVFSOpts;
+const ODAttributeType kODAttributeTypeAlias;
+const ODAttributeType kODAttributeTypeAuthCredential;
+const ODAttributeType kODAttributeTypeCopyTimestamp;
+const ODAttributeType kODAttributeTypeDateRecordCreated;
+const ODAttributeType kODAttributeTypeKerberosRealm;
+const ODAttributeType kODAttributeTypeNTDomainComputerAccount;
+const ODAttributeType kODAttributeTypeOriginalHomeDirectory;
+const ODAttributeType kODAttributeTypeOriginalNFSHomeDirectory;
+const ODAttributeType kODAttributeTypeOriginalNodeName;
+const ODAttributeType kODAttributeTypePrimaryNTDomain;
+const ODAttributeType kODAttributeTypePwdAgingPolicy;
+const ODAttributeType kODAttributeTypeReadOnlyNode;
+const ODAttributeType kODAttributeTypeTimePackage;
+const ODAttributeType kODAttributeTypeTotalSize;
+const ODAttributeType kODAttributeTypeAuthMethod;
+const ODAttributeType kODAttributeTypeMetaNodeLocation;
+const ODAttributeType kODAttributeTypeNodePath;
+const ODAttributeType kODAttributeTypePlugInInfo;
+const ODAttributeType kODAttributeTypeRecordType;
+const ODAttributeType kODAttributeTypeSchema;
+const ODAttributeType kODAttributeTypeSubNodes;
+const ODAttributeType kODAttributeTypeNetGroupTriplet;
+const ODAttributeType kODAttributeTypeSearchPath;
+const ODAttributeType kODAttributeTypeSearchPolicy;
+const ODAttributeType kODAttributeTypeAutomaticSearchPath;
+const ODAttributeType kODAttributeTypeLocalOnlySearchPath;
+const ODAttributeType kODAttributeTypeCustomSearchPath;
+const ODAttributeType kODAttributeTypeNodeOptions;
+//const ODAttributeType kODAttributeTypeNodeSASLRealm;
+const ODAttributeType kODAttributeTypeAdvertisedServices;
+const ODAttributeType kODAttributeTypeLocaleRelay;
+const ODAttributeType kODAttributeTypeLocaleSubnets;
+const ODAttributeType kODAttributeTypeNetworkInterfaces;
+const ODAttributeType kODAttributeTypeParentLocales;
+const ODAttributeType kODAttributeTypePrimaryLocale;
+const ODAttributeType kODAttributeTypeBuildVersion;
+const ODAttributeType kODAttributeTypeConfigAvailable;
+const ODAttributeType kODAttributeTypeConfigFile;
+const ODAttributeType kODAttributeTypeCoreFWVersion;
+const ODAttributeType kODAttributeTypeFunctionalState;
+const ODAttributeType kODAttributeTypeFWVersion;
+const ODAttributeType kODAttributeTypePluginIndex;
+const ODAttributeType kODAttributeTypeNumTableList;
+const ODAttributeType kODAttributeTypeVersion;
+const ODAttributeType kODAttributeTypePIDValue;
+const ODAttributeType kODAttributeTypeProcessName;
+const ODAttributeType kODAttributeTypeTotalRefCount;
+const ODAttributeType kODAttributeTypeDirRefCount;
+const ODAttributeType kODAttributeTypeNodeRefCount;
+const ODAttributeType kODAttributeTypeRecRefCount;
+const ODAttributeType kODAttributeTypeAttrListRefCount;
+const ODAttributeType kODAttributeTypeAttrListValueRefCount;
+const ODAttributeType kODAttributeTypeDirRefs;
+const ODAttributeType kODAttributeTypeNodeRefs;
+const ODAttributeType kODAttributeTypeRecRefs;
+const ODAttributeType kODAttributeTypeAttrListRefs;
+const ODAttributeType kODAttributeTypeAttrListValueRefs;
+
+const ODAuthenticationType kODAuthenticationType2WayRandom;
+const ODAuthenticationType kODAuthenticationType2WayRandomChangePasswd;
+const ODAuthenticationType kODAuthenticationTypeAPOP;
+const ODAuthenticationType kODAuthenticationTypeCRAM_MD5;
+const ODAuthenticationType kODAuthenticationTypeChangePasswd;
+const ODAuthenticationType kODAuthenticationTypeClearText;
+const ODAuthenticationType kODAuthenticationTypeCrypt;
+const ODAuthenticationType kODAuthenticationTypeDIGEST_MD5;
+const ODAuthenticationType kODAuthenticationTypeDeleteUser;
+const ODAuthenticationType kODAuthenticationTypeGetEffectivePolicy;
+const ODAuthenticationType kODAuthenticationTypeGetGlobalPolicy;
+const ODAuthenticationType kODAuthenticationTypeGetKerberosPrincipal;
+const ODAuthenticationType kODAuthenticationTypeGetPolicy;
+const ODAuthenticationType kODAuthenticationTypeGetUserData;
+const ODAuthenticationType kODAuthenticationTypeGetUserName;
+const ODAuthenticationType kODAuthenticationTypeKerberosTickets;
+const ODAuthenticationType kODAuthenticationTypeMPPEMasterKeys;
+const ODAuthenticationType kODAuthenticationTypeMSCHAP2;
+const ODAuthenticationType kODAuthenticationTypeNTLMv2;
+const ODAuthenticationType kODAuthenticationTypeNTLMv2WithSessionKey;
+const ODAuthenticationType kODAuthenticationTypeNewUser;
+const ODAuthenticationType kODAuthenticationTypeNewUserWithPolicy;
+const ODAuthenticationType kODAuthenticationTypeNodeNativeClearTextOK;
+const ODAuthenticationType kODAuthenticationTypeNodeNativeNoClearText;
+const ODAuthenticationType kODAuthenticationTypeReadSecureHash;
+const ODAuthenticationType kODAuthenticationTypeSMBNTv2UserSessionKey;
+const ODAuthenticationType kODAuthenticationTypeSMBWorkstationCredentialSessionKey;
+const ODAuthenticationType kODAuthenticationTypeSMB_LM_Key;
+const ODAuthenticationType kODAuthenticationTypeSMB_NT_Key;
+const ODAuthenticationType kODAuthenticationTypeSMB_NT_UserSessionKey;
+const ODAuthenticationType kODAuthenticationTypeSMB_NT_WithUserSessionKey;
+const ODAuthenticationType kODAuthenticationTypeSetGlobalPolicy;
+const ODAuthenticationType kODAuthenticationTypeSetLMHash;
+const ODAuthenticationType kODAuthenticationTypeSetNTHash;
+const ODAuthenticationType kODAuthenticationTypeSetPassword;
+const ODAuthenticationType kODAuthenticationTypeSetPasswordAsCurrent;
+const ODAuthenticationType kODAuthenticationTypeSetPolicy;
+const ODAuthenticationType kODAuthenticationTypeSetPolicyAsCurrent;
+const ODAuthenticationType kODAuthenticationTypeSetUserData;
+const ODAuthenticationType kODAuthenticationTypeSetUserName;
+const ODAuthenticationType kODAuthenticationTypeSetWorkstationPassword;
+const ODAuthenticationType kODAuthenticationTypeWithAuthorizationRef;
+const ODAuthenticationType kODAuthenticationTypeWriteSecureHash;"""
+
+FUNCTIONS = """
+ODSessionRef ODSessionCreate ( CFAllocatorRef allocator, CFDictionaryRef options, CFErrorRef *error );
+CFArrayRef ODSessionCopyNodeNames ( CFAllocatorRef allocator, ODSessionRef session, CFErrorRef *error );
+
+ODNodeRef ODNodeCreateWithName ( CFAllocatorRef allocator, ODSessionRef session, CFStringRef nodeName, CFErrorRef *error );
+bool ODNodeSetCredentials ( ODNodeRef node, ODRecordType recordType, CFStringRef recordName, CFStringRef password, CFErrorRef *error );
+CFDictionaryRef ODNodeCopyDetails ( ODNodeRef node, CFArrayRef keys, CFErrorRef *error );
+ODRecordRef ODNodeCopyRecord ( ODNodeRef node, ODRecordType recordType, CFStringRef recordName, CFTypeRef attributes, CFErrorRef *error );
+
+CFDictionaryRef ODRecordCopyDetails ( ODRecordRef record, CFArrayRef attributes, CFErrorRef *error );
+bool ODRecordVerifyPassword ( ODRecordRef record, CFStringRef password, CFErrorRef *error );
+bool ODRecordVerifyPasswordExtended ( ODRecordRef record, ODAuthenticationType authType, CFArrayRef authItems, CFArrayRef *outAuthItems, ODContextRef *outContext, CFErrorRef *error );
+
+CFArrayRef ODQueryCopyResults ( ODQueryRef query, bool allowPartialResults, CFErrorRef *error );
+ODQueryRef ODQueryCreateWithNode ( CFAllocatorRef allocator, ODNodeRef node, CFTypeRef recordTypeOrList, ODAttributeType attribute, ODMatchType matchType, CFTypeRef queryValueOrList, CFTypeRef returnAttributeOrList, CFIndex maxResults, CFErrorRef *error );
+"""
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxframeworks_utils_cffipy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_utils_cffi.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_utils_cffi.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/frameworks/_utils_cffi.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+
+INCLUDES = """
+#include <CoreFoundation/CoreFoundation.h>
+"""
+
+EXTRA_LINKS = []
+
+TYPES = """
+typedef const struct __CFTimeZone *CFTimeZoneRef;
+
+typedef const struct __CFLocale *CFLocaleRef;
+
+typedef CFTypeRef CFPropertyListRef;
+
+typedef CFOptionFlags CFPropertyListMutabilityOptions;
+enum {
+ kCFPropertyListImmutable = 0,
+ kCFPropertyListMutableContainers,
+ kCFPropertyListMutableContainersAndLeaves
+};
+
+typedef CFIndex CFPropertyListFormat;
+enum {
+ kCFPropertyListOpenStepFormat = 1,
+ kCFPropertyListXMLFormat_v1_0 = 100,
+ kCFPropertyListBinaryFormat_v1_0 = 200
+};
+"""
+
+CONSTANTS = """
+"""
+
+FUNCTIONS = """
+// CFTimeZone
+CFTypeID CFTimeZoneGetTypeID ( void );
+CFTimeZoneRef CFTimeZoneCopyDefault ( void );
+CFStringRef CFTimeZoneGetName ( CFTimeZoneRef tz );
+
+// CFLocale
+CFTypeID CFLocaleGetTypeID ( void );
+CFLocaleRef CFLocaleCopyCurrent ( void );
+CFArrayRef CFLocaleCopyPreferredLanguages ( void );
+
+// CFPropertyList
+CFPropertyListRef CFPropertyListCreateWithData ( CFAllocatorRef allocator, CFDataRef data, CFOptionFlags options, CFPropertyListFormat *format, CFErrorRef *error );
+"""
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxopendirectorypy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/opendirectory.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/opendirectory.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/opendirectory.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,282 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+A set of Python classes that wrap common CFOpenDirectory classes.
+"""
+
+from ._corefoundation import ffi, lib as od
+from .corefoundation import CFObjectRef, CFErrorRef, \
+ CFArrayRef, CFStringRef, CFDictionaryRef
+
+
+class ODError(Exception):
+ """
+ OpenDirectory error occurred.
+ """
+
+
+
+class ODSession(CFObjectRef):
+ """
+ Wraps a cffi/ODSession object.
+ """
+
+ def __init__(self, session=None):
+ """
+ Create an ODSession.
+ """
+
+ if session is None:
+ error = ffi.new("CFErrorRef *")
+ session = od.ODSessionCreate(ffi.NULL, ffi.NULL, error)
+ if session == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to create ODSession: {}".format(error.error()))
+ super(ODSession, self).__init__(session)
+
+
+ @classmethod
+ def defaultSession(cls):
+ """
+ Return the default session.
+
+ @return: the default session
+ @rtype: L{ODSession}
+ """
+ return cls(session=od.kODSessionDefault)
+
+
+ def nodeNames(self):
+ """
+ Return a list of all the nodes available to the current ODSession.
+
+ @return: list of node names
+ @rtype: L{list} of L{str}
+ """
+
+ error = ffi.new("CFErrorRef *")
+ nodes = od.ODSessionCopyNodeNames(ffi.NULL, self.ref(), error)
+ if nodes == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to get node names from session: {}".format(error.error()))
+
+ nodes = CFArrayRef(nodes)
+ return nodes.toList()
+
+
+
+class ODNode(CFObjectRef):
+ """
+ Wraps a cffi/ODNode object.
+ """
+
+ def __init__(self, session, nodename):
+ """
+ Create an ODNode with the specified name using an ODSession.
+
+ @param session: session to use
+ @type session: L{ODSession}
+ @param nodename: name
+ @type nodename: L{str}
+ """
+ name = CFStringRef.fromString(nodename)
+ error = ffi.new("CFErrorRef *")
+ node = od.ODNodeCreateWithName(ffi.NULL, session.ref(), name.ref(), error)
+ if node == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to create ODNode: {} {}".format(nodename, error.error()))
+ super(ODNode, self).__init__(node)
+
+
+ def setCredentials(self, recordType, user, pswd):
+ """
+ Authentication to this ODNode.
+
+ @param recordType: OD record type to use
+ @type recordType: L{str}
+ @param user: user record name to auth as
+ @type user: L{str}
+ @param pswd: password to use
+ @type pswd: L{str}
+
+ @return: whether or not the authentication worked
+ @rtype: L{bool}
+ """
+
+ recordType = CFStringRef.fromString(recordType)
+ user = CFStringRef.fromString(user)
+ pswd = CFStringRef.fromString(pswd)
+
+ return od.ODNodeSetCredentials(self.ref(), recordType.ref(), user, pswd, ffi.NULL)
+
+
+ def details(self, keys):
+ """
+ Return the node attributes as an L{dict}.
+
+ @param keys: specific attributes to retrieve
+ @type keys: L{list} of L{str}
+
+ @return: result
+ @rtype: L{dict}
+ """
+
+ keys = CFArrayRef.fromList([CFStringRef.fromString(key) for key in keys])
+ error = ffi.new("CFErrorRef *")
+ details = od.ODNodeCopyDetails(self.ref(), keys.ref(), error)
+ if details == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to get node details: {}".format(error.error()))
+ details = CFDictionaryRef(details)
+ return details.toDict()
+
+
+ def record(self, recordType, recordName):
+ """
+ Get a record of the specified type with the specified record name.
+
+ @param recordType: OD record type
+ @type recordType: L{str}
+ @param recordName: record name
+ @type recordName: L{str}
+
+ @return: record
+ @rtype: L{ODRecord} or L{None}
+ """
+
+ recordType = CFStringRef.fromString(recordType)
+ recordName = CFStringRef.fromString(recordName)
+ record = od.ODNodeCopyRecord(self.ref(), recordType.ref(), recordName.ref(), ffi.NULL, ffi.NULL)
+ return ODRecord(record) if record != ffi.NULL else None
+
+
+
+class ODRecord(CFObjectRef):
+ """
+ Wraps a cffi/ODRecord object.
+ """
+
+ def details(self, attributes=None):
+ """
+ Return the record attributes as an L{dict}.
+
+ @param attributes: specific attributes to retrieve
+ @type attributes: L{list} of L{ffi.ODAttributeType}
+
+ @return: result
+ @rtype: L{dict}
+ """
+
+ attributes = CFArrayRef.fromList([CFStringRef.fromString(attribute) for attribute in attributes]) if attributes else CFObjectRef(None)
+ error = ffi.new("CFErrorRef *")
+ details = od.ODRecordCopyDetails(self.ref(), attributes.ref(), error)
+ if details == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to get record details: {}".format(error.error()))
+ details = CFDictionaryRef(details)
+ return details.toDict()
+
+
+ def verifyPassword(self, password):
+ """
+ Verify the password associated with this record.
+
+ @param password: password to check
+ @type password: L{str}
+
+ @return: whether or not the verification worked
+ @rtype: L{bool}
+ """
+
+ password = CFStringRef.fromString(password)
+ return od.ODRecordVerifyPassword(self.ref(), password.ref(), ffi.NULL)
+
+
+ def verifyPasswordExtended(self, authType, authItems):
+ """
+ Verify the authentication details associated with this record, using an extended
+ authentication type.
+
+ @param authType: password to check
+ @type authType: L{str}
+ @param authItems: items needed by the auth type
+ @type authItems: L{list} of L{str}
+
+ @return: whether or not the verification worked
+ @rtype: L{bool}
+ """
+ authType = CFStringRef.fromString(authType)
+ authItems = CFArrayRef.fromList([CFStringRef.fromString(item) for item in authItems])
+ return od.ODRecordVerifyPasswordExtended(self.ref(), authType.ref(), authItems.ref(), ffi.NULL, ffi.NULL, ffi.NULL)
+
+
+
+class ODQuery(CFObjectRef):
+ """
+ Wraps a cffi/ODQuery object.
+ """
+
+ @classmethod
+ def newQuery(cls, node, recordTypes, queryAttribute, matchType, queryValue, fetchAttributes, maxResults):
+ """
+ Create a new query.
+
+ @param node: the node to query
+ @type node: L{ODNode}
+ @param recordTypes: list of record types
+ @type recordTypes: L{list} of L{str}
+ @param queryAttribute: attribute to query or L{None} for complex query
+ @type queryAttribute: L{str} or L{None}
+ @param matchType: type of match
+ @type matchType: L{lib.ODMatchType}
+ @param queryValue: value to query for, or complex query string
+ @type queryValue: L{str}
+ @param fetchAttributes: list of attributes to return in matched records
+ @type fetchAttributes: L{list} of L{lib.ODAttributeType}
+ @param maxResults: maximum number of results to return
+ @type maxResults: L{int}
+
+ @return; the query
+ @rtype: L{ODQuery}
+ """
+ recordTypes = CFArrayRef.fromList([CFStringRef.fromString(recordType) for recordType in recordTypes])
+ queryAttribute = CFStringRef.fromString(queryAttribute) if queryAttribute is not None else CFObjectRef(None)
+ queryValue = CFStringRef.fromString(queryValue) if queryValue is not None else CFObjectRef(None)
+ fetchAttributes = CFArrayRef.fromList([CFStringRef.fromString(fetchAttribute) for fetchAttribute in fetchAttributes])
+ error = ffi.new("CFErrorRef *")
+ query = od.ODQueryCreateWithNode(
+ ffi.NULL, node.ref(), recordTypes.ref(),
+ queryAttribute.ref(), matchType, queryValue.ref(),
+ fetchAttributes.ref(), maxResults, error
+ )
+ if query == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to create query: {}".format(error.error()))
+ return ODQuery(query)
+
+
+ def results(self, allowPartial=False):
+ """
+ Return a list of L{ODRecords} matching the query.
+ """
+ error = ffi.new("CFErrorRef *")
+ results = od.ODQueryCopyResults(self.ref(), allowPartial, error)
+ if results == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise ODError("Unable to create query: {}".format(error.error()))
+ results = CFArrayRef(results)
+ return [ODRecord(result.ref(), owned=False) for result in results.toList()]
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtest__init__py"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/__init__.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/__init__.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/__init__.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtestdatabinary_fmtplist"></a>
<div class="binary"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/binary_fmt.plist</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/binary_fmt.plist
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtestdataxml_fmtplist"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/xml_fmt.plist (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/xml_fmt.plist (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/data/xml_fmt.plist 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>English</key>
+ <string>Hello World!</string>
+ <key>Latin</key>
+ <string>Salve Mundi!</string>
+ </dict>
+</plist>
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfarraypy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfarray.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfarray.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfarray.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..corefoundation import CFArrayRef, CFStringRef
+
+
+"""
+CFArrayRef tests.
+"""
+
+class CFArrayRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFArrayRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFArrayRef.instanceTypeId} returns the right value.
+ """
+
+ array = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertEqual(array.instanceTypeId(), CFArrayRef.typeId())
+
+
+ def test_description(self):
+ """
+ Make sure L{CFArrayRef.description} is the correct string.
+ """
+
+ array = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertTrue("CFArray" in array.description(), msg=array.description())
+
+
+ def test_retain(self):
+ """
+ Make sure L{CFArrayRef.retainCount} returns the correct value based on ownership.
+ """
+
+ array1 = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertEqual(array1.retainCount(), 1)
+ array2 = CFArrayRef(array1.ref(), owned=False)
+ self.assertEqual(array1.retainCount(), 2)
+ self.assertEqual(array2.retainCount(), 2)
+ del array1
+ self.assertEqual(array2.retainCount(), 1)
+
+
+ def test_to_from_list(self):
+ """
+ Make sure L{CFArrayRef.fromString} and L{CFArrayRef.toString} work properly.
+ """
+
+ array = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertEqual(array.toList(), ["abc", "def", ])
+
+
+ def test_count(self):
+ """
+ Make sure L{CFArrayRef.count} returns the right number.
+ """
+
+ array = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertEqual(array.count(), 2)
+
+
+ def test_valueAt(self):
+ """
+ Make sure L{CFArrayRef.valueAtIndex} returns the right number.
+ """
+
+ array = CFArrayRef.fromList((CFStringRef.fromString("abc"), CFStringRef.fromString("def"),))
+ self.assertEqual(array.valueAtIndex(0), "abc")
+ self.assertEqual(array.valueAtIndex(1), "def")
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfdatapy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdata.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdata.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdata.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,83 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..corefoundation import CFDataRef
+
+
+"""
+CFDataRef tests.
+"""
+
+class CFDataRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFDataRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFDataRef.instanceTypeId} returns the right value.
+ """
+
+ data = CFDataRef.fromString("abc")
+ self.assertEqual(data.instanceTypeId(), CFDataRef.typeId())
+
+
+ def test_description(self):
+ """
+ Make sure L{CFDataRef.description} is the correct string.
+ """
+
+ data = CFDataRef.fromString("abc")
+ self.assertTrue("CFData" in data.description())
+
+
+ def test_to_from_string(self):
+ """
+ Make sure L{CFDataRef.fromString} and L{CFDataRef.toString} work properly.
+ """
+
+ data = CFDataRef.fromString("abc")
+ self.assertEqual(data.toString(), "abc")
+
+
+ def test_count(self):
+ """
+ Make sure L{CFDataRef.count} returns correct length.
+ """
+
+ data = CFDataRef.fromString("abc")
+ self.assertEqual(data.count(), 3)
+
+
+ def test_binary(self):
+ """
+ Make sure L{CFDataRef.fromString} and L{CFDataRef.toString} work properly.
+ """
+
+ tmp = self.mktemp()
+ with open(tmp, "w") as f:
+ for i in range(100):
+ f.write(chr(i))
+
+ binary = open(tmp, "r").read()
+
+ data = CFDataRef.fromString(binary)
+ self.assertEqual(data.count(), 100)
+ result = data.toString()
+ self.assertEqual(len(result), 100)
+ for i in range(100):
+ self.assertEqual(result[i], chr(i))
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfdictionarypy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdictionary.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdictionary.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfdictionary.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..corefoundation import CFDictionaryRef, CFStringRef
+
+
+"""
+CFDictionaryRef tests.
+"""
+
+class CFDictionaryRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFDictionaryRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFDictionaryRef.instanceTypeId} returns the right value.
+ """
+
+ cfdict = CFDictionaryRef.fromDict({
+ CFStringRef.fromString("abc"): CFStringRef.fromString("1"),
+ CFStringRef.fromString("def"): CFStringRef.fromString("2"),
+ })
+ self.assertEqual(cfdict.instanceTypeId(), CFDictionaryRef.typeId())
+
+
+ def test_description(self):
+ """
+ Make sure L{CFDictionaryRef.description} is the correct string.
+ """
+
+ cfdict = CFDictionaryRef.fromDict({
+ CFStringRef.fromString("abc"): CFStringRef.fromString("1"),
+ CFStringRef.fromString("def"): CFStringRef.fromString("2"),
+ })
+ self.assertTrue("dict" in cfdict.description(), msg=cfdict.description())
+
+
+ def test_to_from_dict(self):
+ """
+ Make sure L{CFDictionaryRef.fromDict} and L{CFDictionaryRef.toDict} work properly.
+ """
+
+ cfdict = CFDictionaryRef.fromDict({
+ CFStringRef.fromString("abc"): CFStringRef.fromString("1"),
+ CFStringRef.fromString("def"): CFStringRef.fromString("2"),
+ })
+ self.assertEqual(cfdict.toDict(), {"abc": "1", "def": "2", })
+
+
+ def test_count(self):
+ """
+ Make sure L{CFDictionaryRef.count} returns the right number.
+ """
+
+ cfdict = CFDictionaryRef.fromDict({
+ CFStringRef.fromString("abc"): CFStringRef.fromString("1"),
+ CFStringRef.fromString("def"): CFStringRef.fromString("2"),
+ })
+ self.assertEqual(cfdict.count(), 2)
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cflocalepy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cflocale.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cflocale.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cflocale.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..utils import CFLocaleRef
+
+
+"""
+CFLocaleRef tests.
+"""
+
+class CFLocaleRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFLocaleRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFLocaleRef.instanceTypeId} returns the right value.
+ """
+
+ locale = CFLocaleRef.currentLocale()
+ self.assertEqual(locale.instanceTypeId(), CFLocaleRef.typeId())
+
+
+ def test_preferredLanguages(self):
+ """
+ Make sure L{CFLocaleRef.description} is the correct string.
+ """
+
+ langs = CFLocaleRef.preferredLanguages()
+ self.assertTrue(len(langs) > 0)
+ self.assertTrue(all([isinstance(lang, str) for lang in langs]))
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfpropertylistpy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfpropertylist.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfpropertylist.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfpropertylist.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,130 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..corefoundation import CFArrayRef, CFDataRef, CFDictionaryRef, CFStringRef
+from ..utils import CFPropertyListRef
+
+import os
+
+"""
+CFPropertyListRef tests.
+"""
+
+class CFPropertyListRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFPropertyListRef}.
+ """
+
+ def test_readStringData(self):
+ """
+ Make sure L{CFPropertyListRef} can parse a string-only plist.
+ """
+
+ data = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <string>Hello World!</string>
+</plist>
+"""
+ dataref = CFDataRef.fromString(data)
+ plist = CFPropertyListRef.createFromData(dataref)
+ self.assertEqual(plist.instanceTypeId(), CFStringRef.typeId())
+ self.assertEqual(plist.toString(), "Hello World!")
+
+
+ def test_readArrayData(self):
+ """
+ Make sure L{CFPropertyListRef} can parse an array plist.
+ """
+
+ data = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <array>
+ <string>Hello World!</string>
+ <string>Salve Mundi!</string>
+ </array>
+</plist>
+"""
+ dataref = CFDataRef.fromString(data)
+ plist = CFPropertyListRef.createFromData(dataref)
+ self.assertEqual(plist.instanceTypeId(), CFArrayRef.typeId())
+ self.assertEqual(plist.count(), 2)
+ items = plist.toList()
+ self.assertEqual(len(items), 2)
+ self.assertEqual(items[0], "Hello World!")
+ self.assertEqual(items[1], "Salve Mundi!")
+
+
+ def test_readDictionaryData(self):
+ """
+ Make sure L{CFPropertyListRef} can parse a dict plist.
+ """
+
+ data = """<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+ <dict>
+ <key>English</key>
+ <string>Hello World!</string>
+ <key>Latin</key>
+ <string>Salve Mundi!</string>
+ </dict>
+</plist>
+"""
+ dataref = CFDataRef.fromString(data)
+ plist = CFPropertyListRef.createFromData(dataref)
+ self.assertEqual(plist.instanceTypeId(), CFDictionaryRef.typeId())
+ self.assertEqual(plist.count(), 2)
+ items = plist.toDict()
+ self.assertEqual(len(items), 2)
+ self.assertEqual(items["English"], "Hello World!")
+ self.assertEqual(items["Latin"], "Salve Mundi!")
+
+
+ dataDir = os.path.join(os.path.dirname(__file__), "data")
+
+ def test_readDictionaryXMLFile(self):
+ """
+ Make sure L{CFPropertyListRef} can parse a XML plist read from a file.
+ """
+
+ data = open(os.path.join(self.dataDir, "xml_fmt.plist")).read()
+ dataref = CFDataRef.fromString(data)
+ plist = CFPropertyListRef.createFromData(dataref)
+ self.assertEqual(plist.instanceTypeId(), CFDictionaryRef.typeId())
+ self.assertEqual(plist.count(), 2)
+ items = plist.toDict()
+ self.assertEqual(len(items), 2)
+ self.assertEqual(items["English"], "Hello World!")
+ self.assertEqual(items["Latin"], "Salve Mundi!")
+
+
+ def test_readDictionaryBinaryFile(self):
+ """
+ Make sure L{CFPropertyListRef} can parse a binary plist read from a file.
+ """
+
+ data = open(os.path.join(self.dataDir, "binary_fmt.plist")).read()
+ dataref = CFDataRef.fromString(data)
+ plist = CFPropertyListRef.createFromData(dataref)
+ self.assertEqual(plist.instanceTypeId(), CFDictionaryRef.typeId())
+ self.assertEqual(plist.count(), 2)
+ items = plist.toDict()
+ self.assertEqual(len(items), 2)
+ self.assertEqual(items["English"], "Hello World!")
+ self.assertEqual(items["Latin"], "Salve Mundi!")
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cfstringpy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfstring.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfstring.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cfstring.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..corefoundation import CFStringRef
+
+
+"""
+CFStringRef tests.
+"""
+
+class CFStringRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFStringRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFStringRef.instanceTypeId} returns the right value.
+ """
+
+ str = CFStringRef.fromString("abc")
+ self.assertEqual(str.instanceTypeId(), CFStringRef.typeId())
+
+
+ def test_description(self):
+ """
+ Make sure L{CFStringRef.description} is the correct string.
+ """
+
+ str = CFStringRef.fromString("abc")
+ self.assertTrue("CFString" in str.description())
+
+
+ def test_retain(self):
+ """
+ Make sure L{CFStringRef.retainCount} returns the correct value based on ownership.
+ """
+
+ str1 = CFStringRef.fromString("abc")
+ self.assertEqual(str1.retainCount(), 1)
+
+ # In this case copy actually uses the same original object but bumps the retain count
+ str2 = str1.copy()
+ self.assertEqual(str1.retainCount(), 2)
+ self.assertEqual(str2.retainCount(), 2)
+ del str1
+ self.assertEqual(str2.retainCount(), 1)
+
+ str3 = CFStringRef.fromString("def")
+ self.assertEqual(str3.retainCount(), 1)
+ str4 = CFStringRef(str3.ref(), owned=False)
+ self.assertEqual(str3.retainCount(), 2)
+ self.assertEqual(str4.retainCount(), 2)
+ del str3
+ self.assertEqual(str4.retainCount(), 1)
+
+
+ def test_to_from_string(self):
+ """
+ Make sure L{CFStringRef.fromString} and L{CFStringRef.toString} work properly.
+ """
+
+ str = CFStringRef.fromString("abc")
+ self.assertEqual(str.toString(), "abc")
+
+
+ def test_copy(self):
+ """
+ Make sure L{CFStringRef.copy} properly copies a string.
+ """
+
+ str = CFStringRef.fromString("abc")
+ str2 = str.copy()
+ self.assertEqual(str2.toString(), "abc")
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_cftimezonepy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cftimezone.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cftimezone.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_cftimezone.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..utils import CFTimeZoneRef
+
+
+"""
+CFTimeZoneRef tests.
+"""
+
+class CFTimeZoneRefTestCase(unittest.TestCase):
+ """
+ Tests for L{CFTimeZoneRef}.
+ """
+
+ def test_typeid(self):
+ """
+ Make sure L{CFTimeZoneRef.instanceTypeId} returns the right value.
+ """
+
+ tz = CFTimeZoneRef.defaultTimeZone()
+ self.assertEqual(tz.instanceTypeId(), CFTimeZoneRef.typeId())
+
+
+ def test_name(self):
+ """
+ Make sure L{CFTimeZoneRef.description} is the correct string.
+ """
+
+ tz = CFTimeZoneRef.defaultTimeZone()
+ name = tz.name()
+ self.assertTrue(isinstance(name, str))
+ self.assertEqual(name, CFTimeZoneRef.defaultTimeZoneName())
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxtesttest_opendirectorypy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_opendirectory.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_opendirectory.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/test/test_opendirectory.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+##
+# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+from twisted.trial import unittest
+from ..opendirectory import ODSession, ODNode, ODRecord, ODQuery
+from .._corefoundation import lib as od
+
+
+"""
+OpenDirectory tests.
+"""
+
+class OpenDirectoryTestCase(unittest.TestCase):
+ """
+ Tests for OpenDirectory cffi wrappers.
+ """
+
+ def test_session(self):
+ """
+ Make sure L{ODSession} works.
+ """
+
+ session = ODSession.defaultSession()
+ self.assertTrue(session is not None)
+
+
+ def test_nodeNames(self):
+ """
+ Make sure L{ODSession.nodeNames} returns a set of nodes.
+ """
+
+ session = ODSession.defaultSession()
+ names = session.nodeNames()
+ self.assertTrue(isinstance(names, list))
+ self.assertTrue("/Search" in names)
+
+
+ def test_node(self):
+ """
+ Make sure L{ODNode} returns a valid node.
+ """
+
+ session = ODSession.defaultSession()
+ node = ODNode(session, "/Search")
+ self.assertTrue(node is not None)
+ self.assertTrue(isinstance(node.details(["dsAttrTypeStandard:RecordType", ]), dict))
+
+
+ def test_record(self):
+ """
+ Make sure L{ODRecord} returns a valid node.
+ """
+
+ session = ODSession.defaultSession()
+ node = ODNode(session, "/Local/Default")
+ record = node.record("dsRecTypeStandard:Users", "_www")
+ self.assertTrue(isinstance(record, ODRecord))
+ self.assertTrue(isinstance(record.details(["dsAttrTypeStandard:RecordType", ]), dict))
+
+
+ def test_query(self):
+ """
+ Make sure L{ODQuery} returns records.
+ """
+
+ session = ODSession.defaultSession()
+ node = ODNode(session, "/Local/Default")
+ query = ODQuery.newQuery(
+ node, ["dsRecTypeStandard:Users"], "dsAttrTypeStandard:RealName",
+ od.kODMatchContains, "_",
+ ["dsAttrTypeStandard:UniqueID"], 100
+ )
+ self.assertTrue(isinstance(query, ODQuery))
+
+ results = query.results()
+ self.assertTrue(isinstance(results, list))
+ self.assertTrue(len(results) > 0)
+ self.assertTrue(isinstance(results[0], ODRecord), msg=results)
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextplatformosxutilspy"></a>
<div class="addfile"><h4>Added: twext/branches/users/cdaboo/cfod/twext/platform/osx/utils.py (0 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/platform/osx/utils.py (rev 0)
+++ twext/branches/users/cdaboo/cfod/twext/platform/osx/utils.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -0,0 +1,114 @@
</span><ins>+##
+# Copyright (c) 2015 Apple Inc. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##
+
+"""
+A set of Python classes that wrap miscellaneous CoreFoundation classes.
+"""
+
+from ._corefoundation import ffi, lib as cf
+from .corefoundation import CFObjectRef, CFStringRef, CFArrayRef, CFDictionaryRef, CFErrorRef, CFError
+
+
+class CFTimeZoneRef(CFObjectRef):
+ """
+ A wrapper for CFTimeZoneRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFTimeZoneGetTypeID()
+
+
+ @classmethod
+ def defaultTimeZone(cls):
+ cftzref = cf.CFTimeZoneCopyDefault()
+ if cftzref == ffi.NULL:
+ raise CFError("Unable to create a CFTimeZoneRef")
+ return CFTimeZoneRef(cftzref)
+
+
+ @classmethod
+ def defaultTimeZoneName(cls):
+ tz = cls.defaultTimeZone()
+ return tz.name()
+
+
+ def name(self):
+ cfstr = CFStringRef(cf.CFTimeZoneGetName(self.ref()), owned=False)
+ return cfstr.toString()
+
+
+
+class CFLocaleRef(CFObjectRef):
+ """
+ A wrapper for CFLocaleRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ return cf.CFLocaleGetTypeID()
+
+
+ @classmethod
+ def currentLocale(cls):
+ localeref = cf.CFLocaleCopyCurrent()
+ if localeref == ffi.NULL:
+ raise CFError("Unable to create a CFLocaleRef")
+ return CFLocaleRef(localeref)
+
+
+ @classmethod
+ def preferredLanguages(cls):
+ items = cf.CFLocaleCopyPreferredLanguages()
+ if items == ffi.NULL:
+ raise CFError("Unable to get CFLocale preferred languages")
+ items = CFArrayRef(items)
+ return items.toList()
+
+
+
+class CFPropertyListRef(CFObjectRef):
+ """
+ A wrapper for CFPropertyListRef CoreFoundation objects.
+ """
+
+ @staticmethod
+ def typeId():
+ # CFPropertyListRef is actually one of CFStringRef, CFArrayRef or CFDictionaryRef
+ return None
+
+
+ @classmethod
+ def createFromData(cls, data):
+ error = ffi.new("CFErrorRef *")
+ plist = cf.CFPropertyListCreateWithData(ffi.NULL, data.ref(), cf.kCFPropertyListImmutable, ffi.NULL, error)
+ if plist == ffi.NULL:
+ error = CFErrorRef(error[0])
+ raise CFError("Unable to create a CFPropertyListRef: {}".format(error.error()))
+
+ # Map to actual data type
+ plist = CFObjectRef(plist)
+ typeid = plist.instanceTypeId()
+ if typeid == CFStringRef.typeId():
+ plist = CFStringRef(plist.ref(), owned=False)
+ elif typeid == CFArrayRef.typeId():
+ plist = CFArrayRef(plist.ref(), owned=False)
+ elif typeid == CFDictionaryRef.typeId():
+ plist = CFDictionaryRef(plist.ref(), owned=False)
+ else:
+ raise CFError("Unknown CFPropertyListRef type id: {}".format(typeid))
+
+ return plist
</ins></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextwhoopendirectory_odframeworkpy"></a>
<div class="delfile"><h4>Deleted: twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_odframework.py (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_odframework.py 2015-06-17 16:25:23 UTC (rev 14898)
+++ twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_odframework.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-##
-# Copyright (c) 2010-2015 Apple Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-##
-
-"""
-OpenDirectory.framework
-"""
-
-import objc as _objc
-
-__bundle__ = _objc.initFrameworkWrapper(
- "OpenDirectory",
- frameworkIdentifier="com.apple.OpenDirectory",
- frameworkPath=_objc.pathForFramework(
- "/System/Library/Frameworks/OpenDirectory.framework"
- ),
- globals=globals()
-)
</del></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_service.py (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_service.py 2015-06-17 16:25:23 UTC (rev 14898)
+++ twext/branches/users/cdaboo/cfod/twext/who/opendirectory/_service.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -21,7 +21,6 @@
</span><span class="cx"> OpenDirectory directory service implementation.
</span><span class="cx"> """
</span><span class="cx">
</span><del>-from time import time
</del><span class="cx"> from uuid import UUID
</span><span class="cx"> from zope.interface import implementer
</span><span class="cx">
</span><span class="lines">@@ -47,8 +46,7 @@
</span><span class="cx"> )
</span><span class="cx"> from ..util import ConstantsContainer, firstResult, uniqueResult
</span><span class="cx">
</span><del>-from Foundation import NSAutoreleasePool
-from ._odframework import ODSession, ODNode, ODQuery
</del><ins>+from ...platform.osx.opendirectory import ODSession, ODNode, ODQuery, ODError
</ins><span class="cx"> from ._constants import (
</span><span class="cx"> FieldName,
</span><span class="cx"> ODSearchPath, ODRecordType, ODAttribute, ODMatchType, ODAuthMethod,
</span><span class="lines">@@ -82,26 +80,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-def wrapWithAutoreleasePool(f):
- """
- A decorator which creates an autorelease pool and deletes it, causing it
- to drain
- """
- def wrapped(*args, **kwds):
- pool = NSAutoreleasePool.alloc().init()
- try:
- return f(*args, **kwds)
- finally:
- del pool
- return wrapped
-
-
-
-def deferToThreadWithAutoReleasePool(f, *args, **kwargs):
- return deferToThread(wrapWithAutoreleasePool(f), *args, **kwargs)
-
-
-
</del><span class="cx"> #
</span><span class="cx"> # Exceptions
</span><span class="cx"> #
</span><span class="lines">@@ -165,10 +143,6 @@
</span><span class="cx">
</span><span class="cx"> fieldName = ConstantsContainer((BaseDirectoryService.fieldName, FieldName))
</span><span class="cx">
</span><del>- # The auto release pool is a class attribute; if _poolDeletionRegistered
- # is True, that means someone has already added a SystemEventTrigger
- _poolDeletionRegistered = False
-
</del><span class="cx"> def __init__(
</span><span class="cx"> self,
</span><span class="cx"> nodeName=ODSearchPath.search.value,
</span><span class="lines">@@ -186,51 +160,6 @@
</span><span class="cx"> self._suppressSystemRecords = suppressSystemRecords
</span><span class="cx">
</span><span class="cx">
</span><del>- # Create an autorelease pool which will get deleted when someone
- # calls _maybeResetPool( ), but no more often than 60 seconds, hence
- # the "maybe"
- DirectoryService._resetAutoreleasePool()
-
- # Register a pool delete to happen at shutdown
- if not DirectoryService._poolDeletionRegistered:
- from twisted.internet import reactor
- DirectoryService._poolDeletionRegistered = True
- reactor.addSystemEventTrigger("after", "shutdown", DirectoryService._deletePool)
-
-
- @classmethod
- def _deletePool(cls):
- """
- Delete the autorelease pool if we have one
- """
- if hasattr(cls, "_autoReleasePool"):
- del cls._autoReleasePool
-
-
- @classmethod
- def _resetAutoreleasePool(cls):
- """
- Create an autorelease pool, deleting the old one if we had one.
- """
- cls._deletePool()
-
- cls._autoReleasePool = NSAutoreleasePool.alloc().init()
- cls._poolCreationTime = time()
-
-
- @classmethod
- def _maybeResetPool(cls):
- """
- If it's been at least 60 seconds since the last time we created the
- pool, delete the pool (which drains it) and create a new one.
- """
- poolCreationTime = getattr(cls, "_poolCreationTime", 0)
- now = time()
- if (now - poolCreationTime) > 60:
- cls._resetAutoreleasePool()
-
-
-
</del><span class="cx"> @property
</span><span class="cx"> def nodeName(self):
</span><span class="cx"> return self._nodeName
</span><span class="lines">@@ -260,10 +189,9 @@
</span><span class="cx"> if not hasattr(self, "_localNode"):
</span><span class="cx">
</span><span class="cx"> if self.nodeName == ODSearchPath.search.value:
</span><del>- details, error = self.node.nodeDetailsForKeys_error_(
- (ODAttribute.searchPath.value,), None
- )
- if error:
</del><ins>+ try:
+ details = self.node.details((ODAttribute.searchPath.value,))
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while examining Search path",
</span><span class="cx"> error=error
</span><span class="lines">@@ -296,8 +224,7 @@
</span><span class="cx"> Get the underlying directory session.
</span><span class="cx"> """
</span><span class="cx"> if not hasattr(self, "_session"):
</span><del>- session = ODSession.defaultSession()
- self._session = session
</del><ins>+ self._session = ODSession.defaultSession()
</ins><span class="cx"> return self._session
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -313,11 +240,9 @@
</span><span class="cx"> @raises: L{OpenDirectoryConnectionError} if unable to connect.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- node, error = ODNode.nodeWithSession_name_error_(
- self.session, nodeName, None
- )
-
- if error:
</del><ins>+ try:
+ node = ODNode(self.session, nodeName)
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while trying to connect to OpenDirectory node "
</span><span class="cx"> "{source.nodeName!r}: {error}",
</span><span class="lines">@@ -542,18 +467,17 @@
</span><span class="cx"> else:
</span><span class="cx"> maxResults = limitResults
</span><span class="cx">
</span><del>- query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
- node,
- scrubbedRecordTypes,
- None,
- matchType,
- queryString,
- self._getFetchAttributes(),
- maxResults,
- None
- )
-
- if error:
</del><ins>+ try:
+ query = ODQuery.newQuery(
+ node,
+ scrubbedRecordTypes,
+ None,
+ matchType,
+ queryString,
+ self._getFetchAttributes(),
+ maxResults,
+ )
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while forming OpenDirectory compound query: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -676,18 +600,17 @@
</span><span class="cx"> u",".join(r.name for r in recordTypes)
</span><span class="cx"> )
</span><span class="cx">
</span><del>- query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
- node,
- scrubbedRecordTypes,
- queryAttribute,
- matchType | caseInsensitive,
- queryValue,
- self._getFetchAttributes(),
- maxResults,
- None
- )
-
- if error:
</del><ins>+ try:
+ query = ODQuery.newQuery(
+ node,
+ scrubbedRecordTypes,
+ queryAttribute,
+ matchType | caseInsensitive,
+ queryValue,
+ self._getFetchAttributes(),
+ maxResults,
+ )
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while forming OpenDirectory match query: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -708,9 +631,10 @@
</span><span class="cx"> @return: True if system account record, False otherwise
</span><span class="cx"> @rtype: C{Boolean}
</span><span class="cx"> """
</span><del>- details, error = odRecord.recordDetailsForAttributes_error_(None, None)
</del><span class="cx">
</span><del>- if error:
</del><ins>+ try:
+ details = odRecord.details()
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while reading OpenDirectory record: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -784,18 +708,17 @@
</span><span class="cx"> if query is None:
</span><span class="cx"> returnValue(())
</span><span class="cx">
</span><del>- if DEFER_TO_THREAD:
- odRecords, error = (
- yield deferToThreadWithAutoReleasePool(
- query.resultsAllowingPartial_error_,
- False,
- None
</del><ins>+ try:
+ if DEFER_TO_THREAD:
+ odRecords = (
+ yield deferToThread(
+ query.results,
+ False,
+ )
</ins><span class="cx"> )
</span><del>- )
- else:
- odRecords, error = query.resultsAllowingPartial_error_(False, None)
-
- if error:
</del><ins>+ else:
+ odRecords = query.results(False)
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while executing OpenDirectory query: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -834,9 +757,6 @@
</span><span class="cx"> self, expression, recordTypes=None, records=None,
</span><span class="cx"> limitResults=None, timeoutSeconds=None
</span><span class="cx"> ):
</span><del>- DirectoryService._maybeResetPool()
-
-
</del><span class="cx"> if isinstance(expression, MatchExpression):
</span><span class="cx"> self.log.debug("OD call: {}".format(expression))
</span><span class="cx"> try:
</span><span class="lines">@@ -874,8 +794,6 @@
</span><span class="cx"> CompoundExpression up into MatchExpressions for sending to the local
</span><span class="cx"> node.
</span><span class="cx"> """
</span><del>- DirectoryService._maybeResetPool()
-
</del><span class="cx"> try:
</span><span class="cx"> self.log.debug("OD call: {}".format(expression))
</span><span class="cx"> query = self._queryFromCompoundExpression(
</span><span class="lines">@@ -984,10 +902,9 @@
</span><span class="cx">
</span><span class="cx"> @return: ODRecord, or None
</span><span class="cx"> """
</span><del>- record, error = self.node.recordWithRecordType_name_attributes_error_(
- ODRecordType.user.value, username, None, None
- )
- if error:
</del><ins>+ try:
+ record = self.node.record(ODRecordType.user.value, username)
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while looking up user: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -1037,7 +954,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> @implementer(IPlaintextPasswordVerifier, IHTTPDigestVerifier)
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span><span class="lines">@@ -1051,9 +967,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __init__(self, service, odRecord):
</span><del>- details, error = odRecord.recordDetailsForAttributes_error_(None, None)
</del><span class="cx">
</span><del>- if error:
</del><ins>+ try:
+ details = odRecord.details()
+ except ODError as error:
</ins><span class="cx"> self.log.error(
</span><span class="cx"> "Error while reading OpenDirectory record: {error}",
</span><span class="cx"> error=error
</span><span class="lines">@@ -1104,7 +1021,7 @@
</span><span class="cx"> if type(values) is bytes:
</span><span class="cx"> values = (coerceType(fieldName, values),)
</span><span class="cx"> else:
</span><del>- values = tuple(coerceType(fieldName, v) for v in values)
</del><ins>+ values = tuple(coerceType(fieldName, v.decode("utf-8")) for v in values)
</ins><span class="cx">
</span><span class="cx"> if service.fieldName.isMultiValue(fieldName):
</span><span class="cx"> fields[fieldName] = values
</span><span class="lines">@@ -1146,20 +1063,19 @@
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def verifyPlaintextPassword(self, password):
</span><span class="cx">
</span><del>- if DEFER_TO_THREAD:
- result, error = (
- yield deferToThreadWithAutoReleasePool(
- self._odRecord.verifyPassword_error_,
</del><ins>+ try:
+ if DEFER_TO_THREAD:
+ result = (
+ yield deferToThread(
+ self._odRecord.verifyPassword,
+ password,
+ )
+ )
+ else:
+ result = self._odRecord.verifyPassword(
</ins><span class="cx"> password,
</span><del>- None
</del><span class="cx"> )
</span><del>- )
- else:
- result, error = self._odRecord.verifyPassword_error_(
- password, None
- )
-
- if error:
</del><ins>+ except ODError:
</ins><span class="cx"> returnValue(False)
</span><span class="cx">
</span><span class="cx"> returnValue(result)
</span><span class="lines">@@ -1199,23 +1115,21 @@
</span><span class="cx"> response=response
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if DEFER_TO_THREAD:
- result, _ignore_m1, _ignore_m2, error = (
- yield deferToThreadWithAutoReleasePool(
- self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_,
</del><ins>+ try:
+ if DEFER_TO_THREAD:
+ result = (
+ yield deferToThread(
+ self._odRecord.verifyPasswordExtended,
+ ODAuthMethod.digestMD5.value,
+ [username, challenge, responseArg, method],
+ )
+ )
+ else:
+ result = self._odRecord.verifyPasswordExtended(
</ins><span class="cx"> ODAuthMethod.digestMD5.value,
</span><span class="cx"> [username, challenge, responseArg, method],
</span><del>- None, None, None
</del><span class="cx"> )
</span><del>- )
- else:
- result, _ignore_m1, _ignore_m2, error = self._odRecord.verifyExtendedWithAuthenticationType_authenticationItems_continueItems_context_error_(
- ODAuthMethod.digestMD5.value,
- [username, challenge, responseArg, method],
- None, None, None
- )
-
- if error:
</del><ins>+ except ODError:
</ins><span class="cx"> returnValue(False)
</span><span class="cx">
</span><span class="cx"> returnValue(result)
</span></span></pre></div>
<a id="twextbranchesuserscdaboocfodtwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/branches/users/cdaboo/cfod/twext/who/opendirectory/test/test_service.py (14898 => 14899)</h4>
<pre class="diff"><span>
<span class="info">--- twext/branches/users/cdaboo/cfod/twext/who/opendirectory/test/test_service.py 2015-06-17 16:25:23 UTC (rev 14898)
+++ twext/branches/users/cdaboo/cfod/twext/who/opendirectory/test/test_service.py 2015-06-18 14:58:26 UTC (rev 14899)
</span><span class="lines">@@ -38,10 +38,7 @@
</span><span class="cx"> def setUp(self):
</span><span class="cx"> self.service = DirectoryService()
</span><span class="cx">
</span><del>- def tearDown(self):
- self.service._deletePool()
</del><span class="cx">
</span><del>-
</del><span class="cx"> def test_queryFromMatchExpression_recordType(self):
</span><span class="cx"> """
</span><span class="cx"> Make sure queryFromMatchExpression handles recordType correctly
</span></span></pre>
</div>
</div>
</body>
</html>