<!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>[12131] twext/trunk/twext/who</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12131">12131</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-18 14:48:34 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use relative imports</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoaggregatepy">twext/trunk/twext/who/aggregate.py</a></li>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
<li><a href="#twexttrunktwextwhoexpressionpy">twext/trunk/twext/who/expression.py</a></li>
<li><a href="#twexttrunktwextwhoindexpy">twext/trunk/twext/who/index.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectoryservicepy">twext/trunk/twext/who/opendirectory/service.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectorytesttest_servicepy">twext/trunk/twext/who/opendirectory/test/test_service.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_aggregatepy">twext/trunk/twext/who/test/test_aggregate.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_directorypy">twext/trunk/twext/who/test/test_directory.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_expressionpy">twext/trunk/twext/who/test/test_expression.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_indexpy">twext/trunk/twext/who/test/test_index.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_utilpy">twext/trunk/twext/who/test/test_util.py</a></li>
<li><a href="#twexttrunktwextwhotesttest_xmlpy">twext/trunk/twext/who/test/test_xml.py</a></li>
<li><a href="#twexttrunktwextwhoutilpy">twext/trunk/twext/who/util.py</a></li>
<li><a href="#twexttrunktwextwhoxmlpy">twext/trunk/twext/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoaggregatepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/aggregate.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/aggregate.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/aggregate.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import gatherResults, FirstError
</span><span class="cx">
</span><del>-from twext.who.idirectory import DirectoryConfigurationError
-from twext.who.idirectory import IDirectoryService
-from twext.who.directory import DirectoryService as BaseDirectoryService
-from twext.who.directory import DirectoryRecord
-from twext.who.util import ConstantsContainer
</del><ins>+from .idirectory import DirectoryConfigurationError, IDirectoryService
+from .directory import (
+ DirectoryService as BaseDirectoryService, DirectoryRecord
+)
+from .util import ConstantsContainer
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class DirectoryService(BaseDirectoryService):
</span></span></pre></div>
<a id="twexttrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/directory.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/directory.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -29,12 +29,13 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx"> from twisted.internet.defer import succeed, fail
</span><span class="cx">
</span><del>-from twext.who.idirectory import QueryNotSupportedError, NotAllowedError
-from twext.who.idirectory import FieldName, RecordType
-from twext.who.idirectory import IDirectoryService, IDirectoryRecord
-from twext.who.expression import CompoundExpression, Operand
-from twext.who.expression import MatchExpression
-from twext.who.util import uniqueResult, describe
</del><ins>+from .idirectory import (
+ QueryNotSupportedError, NotAllowedError,
+ FieldName, RecordType,
+ IDirectoryService, IDirectoryRecord,
+)
+from .expression import CompoundExpression, Operand, MatchExpression
+from .util import uniqueResult, describe
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoexpressionpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/expression.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/expression.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/expression.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx"> "MatchExpression",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twisted.python.constants import Names, NamedConstant
-from twisted.python.constants import Flags, FlagConstant
</del><ins>+from twisted.python.constants import (
+ Names, NamedConstant, Flags, FlagConstant,
+)
</ins><span class="cx">
</span><del>-from twext.who.util import iterFlags, describe
</del><ins>+from .util import iterFlags, describe
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span></span></pre></div>
<a id="twexttrunktwextwhoindexpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/index.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/index.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/index.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -27,12 +27,13 @@
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx">
</span><del>-from twext.who.util import ConstantsContainer
-from twext.who.util import uniqueResult
-from twext.who.idirectory import FieldName as BaseFieldName
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
-from twext.who.directory import DirectoryService as BaseDirectoryService
-from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
</del><ins>+from .util import ConstantsContainer, uniqueResult
+from .idirectory import FieldName as BaseFieldName
+from .expression import MatchExpression, MatchType, MatchFlags
+from .directory import (
+ DirectoryService as BaseDirectoryService,
+ DirectoryRecord as BaseDirectoryRecord,
+)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectoryservicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/service.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/service.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/opendirectory/service.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -25,22 +25,23 @@
</span><span class="cx">
</span><span class="cx"> from odframework import ODSession, ODNode, ODQuery
</span><span class="cx">
</span><del>-from twext.python.log import Logger
</del><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.python.constants import Values, ValueConstant
</span><span class="cx">
</span><del>-from twext.who.idirectory import (
</del><ins>+from twext.python.log import Logger
+
+from ..idirectory import (
</ins><span class="cx"> DirectoryServiceError, QueryNotSupportedError,
</span><del>- FieldName as BaseFieldName,
- RecordType as BaseRecordType,
</del><ins>+ FieldName as BaseFieldName, RecordType as BaseRecordType,
</ins><span class="cx"> )
</span><del>-from twext.who.directory import (
</del><ins>+from ..directory import (
</ins><span class="cx"> DirectoryService as BaseDirectoryService,
</span><span class="cx"> DirectoryRecord as BaseDirectoryRecord,
</span><span class="cx"> )
</span><del>-from twext.who.expression import CompoundExpression, Operand
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
-from twext.who.util import iterFlags, ConstantsContainer
</del><ins>+from ..expression import (
+ CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags,
+)
+from ..util import iterFlags, ConstantsContainer
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -19,10 +19,11 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twext.who.opendirectory import DirectoryService
-from twext.who.expression import (
</del><ins>+
+from ...expression import (
</ins><span class="cx"> CompoundExpression, MatchExpression, MatchType, Operand
</span><span class="cx"> )
</span><ins>+from ..service import DirectoryService
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_aggregatepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_aggregate.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_aggregate.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_aggregate.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -21,13 +21,12 @@
</span><span class="cx"> from twisted.python.components import proxyForInterface
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><del>-from twext.who.idirectory import IDirectoryService, DirectoryConfigurationError
-from twext.who.aggregate import DirectoryService, DirectoryRecord
-from twext.who.util import ConstantsContainer
-from twext.who.test import test_directory, test_xml
-from twext.who.test.test_xml import (
- QueryMixIn, xmlService,
- TestService as XMLTestService,
</del><ins>+from ..idirectory import IDirectoryService, DirectoryConfigurationError
+from ..aggregate import DirectoryService, DirectoryRecord
+from ..util import ConstantsContainer
+from . import test_directory, test_xml
+from .test_xml import (
+ QueryMixIn, xmlService, TestService as XMLTestService,
</ins><span class="cx"> DirectoryServiceConvenienceTestMixIn
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_directorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_directory.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_directory.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_directory.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -28,11 +28,13 @@
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx"> from twisted.internet.defer import succeed
</span><span class="cx">
</span><del>-from twext.who.idirectory import QueryNotSupportedError, NotAllowedError
-from twext.who.idirectory import RecordType, FieldName
-from twext.who.idirectory import IDirectoryService, IDirectoryRecord
-from twext.who.expression import CompoundExpression, Operand
-from twext.who.directory import DirectoryService, DirectoryRecord
</del><ins>+from ..idirectory import (
+ QueryNotSupportedError, NotAllowedError,
+ RecordType, FieldName,
+ IDirectoryService, IDirectoryRecord,
+)
+from ..expression import CompoundExpression, Operand
+from ..directory import DirectoryService, DirectoryRecord
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_expressionpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_expression.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_expression.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_expression.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -20,8 +20,8 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><del>-from twext.who.idirectory import FieldName
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
</del><ins>+from ..idirectory import FieldName
+from ..expression import MatchExpression, MatchType, MatchFlags
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_indexpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_index.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_index.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_index.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -21,12 +21,11 @@
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks, returnValue
</span><span class="cx">
</span><del>-from twext.who.idirectory import FieldName as BaseFieldName
-from twext.who.idirectory import QueryNotSupportedError
-from twext.who.expression import MatchExpression, MatchType
-from twext.who.index import DirectoryService, DirectoryRecord
-from twext.who.test import test_directory
-from twext.who.test.test_directory import RecordStorage
</del><ins>+from ..idirectory import FieldName as BaseFieldName, QueryNotSupportedError
+from ..expression import MatchExpression, MatchType
+from ..index import DirectoryService, DirectoryRecord
+from . import test_directory
+from .test_directory import RecordStorage
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_utilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_util.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_util.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_util.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -21,12 +21,12 @@
</span><span class="cx"> from itertools import chain
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><del>-from twisted.python.constants import Names, NamedConstant
-from twisted.python.constants import Flags, FlagConstant
</del><ins>+from twisted.python.constants import (
+ Names, NamedConstant, Flags, FlagConstant,
+)
</ins><span class="cx">
</span><del>-from twext.who.idirectory import DirectoryServiceError
-from twext.who.util import ConstantsContainer
-from twext.who.util import uniqueResult, describe
</del><ins>+from ..idirectory import DirectoryServiceError
+from ..util import ConstantsContainer, uniqueResult, describe
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/test/test_xml.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/test/test_xml.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/test/test_xml.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -26,12 +26,13 @@
</span><span class="cx"> from twisted.python.filepath import FilePath
</span><span class="cx"> from twisted.internet.defer import inlineCallbacks
</span><span class="cx">
</span><del>-from twext.who.idirectory import NoSuchRecordError
-from twext.who.expression import CompoundExpression, Operand
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
-from twext.who.xml import ParseError
-from twext.who.xml import DirectoryService, DirectoryRecord
-from twext.who.test import test_index
</del><ins>+from ..idirectory import NoSuchRecordError
+from ..expression import (
+ CompoundExpression, Operand,
+ MatchExpression, MatchType, MatchFlags
+)
+from ..xml import ParseError, DirectoryService, DirectoryRecord
+from . import test_index
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoutilpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/util.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/util.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/util.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -26,10 +26,11 @@
</span><span class="cx"> "iterFlags",
</span><span class="cx"> ]
</span><span class="cx">
</span><del>-from twisted.python.constants import Names, Values, Flags
-from twisted.python.constants import NamedConstant, ValueConstant, FlagConstant
</del><ins>+from twisted.python.constants import (
+ Names, Values, Flags, NamedConstant, ValueConstant, FlagConstant,
+)
</ins><span class="cx">
</span><del>-from twext.who.idirectory import DirectoryServiceError
</del><ins>+from .idirectory import DirectoryServiceError
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (12130 => 12131)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py 2013-12-18 22:28:51 UTC (rev 12130)
+++ twext/trunk/twext/who/xml.py 2013-12-18 22:48:34 UTC (rev 12131)
</span><span class="lines">@@ -30,20 +30,23 @@
</span><span class="cx"> from time import time
</span><span class="cx"> from uuid import UUID
</span><span class="cx">
</span><del>-from xml.etree.ElementTree import parse as parseXML
-from xml.etree.ElementTree import ParseError as XMLParseError
-from xml.etree.ElementTree import tostring as etreeToString
-from xml.etree.ElementTree import Element as XMLElement
</del><ins>+from xml.etree.ElementTree import (
+ parse as parseXML, ParseError as XMLParseError,
+ tostring as etreeToString, Element as XMLElement,
+)
</ins><span class="cx">
</span><span class="cx"> from twisted.python.constants import Values, ValueConstant
</span><span class="cx"> from twisted.internet.defer import fail
</span><span class="cx">
</span><del>-from twext.who.idirectory import DirectoryServiceError
-from twext.who.idirectory import NoSuchRecordError, UnknownRecordTypeError
-from twext.who.idirectory import RecordType, FieldName as BaseFieldName
-from twext.who.index import DirectoryService as BaseDirectoryService
-from twext.who.index import DirectoryRecord
-from twext.who.index import FieldName as IndexFieldName
</del><ins>+from .idirectory import (
+ DirectoryServiceError,
+ NoSuchRecordError, UnknownRecordTypeError,
+ RecordType, FieldName as BaseFieldName,
+)
+from .index import (
+ DirectoryService as BaseDirectoryService,
+ DirectoryRecord, FieldName as IndexFieldName,
+)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>