[CalendarServer-changes] [12131] twext/trunk/twext/who
source_changes at macosforge.org
source_changes at macosforge.org
Wed Mar 12 11:20:37 PDT 2014
Revision: 12131
http://trac.calendarserver.org//changeset/12131
Author: wsanchez at apple.com
Date: 2013-12-18 14:48:34 -0800 (Wed, 18 Dec 2013)
Log Message:
-----------
Use relative imports
Modified Paths:
--------------
twext/trunk/twext/who/aggregate.py
twext/trunk/twext/who/directory.py
twext/trunk/twext/who/expression.py
twext/trunk/twext/who/index.py
twext/trunk/twext/who/opendirectory/service.py
twext/trunk/twext/who/opendirectory/test/test_service.py
twext/trunk/twext/who/test/test_aggregate.py
twext/trunk/twext/who/test/test_directory.py
twext/trunk/twext/who/test/test_expression.py
twext/trunk/twext/who/test/test_index.py
twext/trunk/twext/who/test/test_util.py
twext/trunk/twext/who/test/test_xml.py
twext/trunk/twext/who/util.py
twext/trunk/twext/who/xml.py
Modified: twext/trunk/twext/who/aggregate.py
===================================================================
--- 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)
@@ -28,11 +28,11 @@
from twisted.internet.defer import gatherResults, FirstError
-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
+from .idirectory import DirectoryConfigurationError, IDirectoryService
+from .directory import (
+ DirectoryService as BaseDirectoryService, DirectoryRecord
+)
+from .util import ConstantsContainer
class DirectoryService(BaseDirectoryService):
Modified: twext/trunk/twext/who/directory.py
===================================================================
--- 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)
@@ -29,12 +29,13 @@
from twisted.internet.defer import inlineCallbacks, returnValue
from twisted.internet.defer import succeed, fail
-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
+from .idirectory import (
+ QueryNotSupportedError, NotAllowedError,
+ FieldName, RecordType,
+ IDirectoryService, IDirectoryRecord,
+)
+from .expression import CompoundExpression, Operand, MatchExpression
+from .util import uniqueResult, describe
Modified: twext/trunk/twext/who/expression.py
===================================================================
--- 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)
@@ -28,10 +28,11 @@
"MatchExpression",
]
-from twisted.python.constants import Names, NamedConstant
-from twisted.python.constants import Flags, FlagConstant
+from twisted.python.constants import (
+ Names, NamedConstant, Flags, FlagConstant,
+)
-from twext.who.util import iterFlags, describe
+from .util import iterFlags, describe
#
Modified: twext/trunk/twext/who/index.py
===================================================================
--- 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)
@@ -27,12 +27,13 @@
from twisted.python.constants import Names, NamedConstant
from twisted.internet.defer import succeed, inlineCallbacks, returnValue
-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
+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,
+)
Modified: twext/trunk/twext/who/opendirectory/service.py
===================================================================
--- 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)
@@ -25,22 +25,23 @@
from odframework import ODSession, ODNode, ODQuery
-from twext.python.log import Logger
from twisted.python.constants import Names, NamedConstant
from twisted.python.constants import Values, ValueConstant
-from twext.who.idirectory import (
+from twext.python.log import Logger
+
+from ..idirectory import (
DirectoryServiceError, QueryNotSupportedError,
- FieldName as BaseFieldName,
- RecordType as BaseRecordType,
+ FieldName as BaseFieldName, RecordType as BaseRecordType,
)
-from twext.who.directory import (
+from ..directory import (
DirectoryService as BaseDirectoryService,
DirectoryRecord as BaseDirectoryRecord,
)
-from twext.who.expression import CompoundExpression, Operand
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
-from twext.who.util import iterFlags, ConstantsContainer
+from ..expression import (
+ CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags,
+)
+from ..util import iterFlags, ConstantsContainer
Modified: twext/trunk/twext/who/opendirectory/test/test_service.py
===================================================================
--- 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)
@@ -19,10 +19,11 @@
"""
from twisted.trial import unittest
-from twext.who.opendirectory import DirectoryService
-from twext.who.expression import (
+
+from ...expression import (
CompoundExpression, MatchExpression, MatchType, Operand
)
+from ..service import DirectoryService
Modified: twext/trunk/twext/who/test/test_aggregate.py
===================================================================
--- 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)
@@ -21,13 +21,12 @@
from twisted.python.components import proxyForInterface
from twisted.trial import unittest
-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,
+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,
DirectoryServiceConvenienceTestMixIn
)
Modified: twext/trunk/twext/who/test/test_directory.py
===================================================================
--- 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)
@@ -28,11 +28,13 @@
from twisted.internet.defer import inlineCallbacks
from twisted.internet.defer import succeed
-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
+from ..idirectory import (
+ QueryNotSupportedError, NotAllowedError,
+ RecordType, FieldName,
+ IDirectoryService, IDirectoryRecord,
+)
+from ..expression import CompoundExpression, Operand
+from ..directory import DirectoryService, DirectoryRecord
Modified: twext/trunk/twext/who/test/test_expression.py
===================================================================
--- 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)
@@ -20,8 +20,8 @@
from twisted.trial import unittest
-from twext.who.idirectory import FieldName
-from twext.who.expression import MatchExpression, MatchType, MatchFlags
+from ..idirectory import FieldName
+from ..expression import MatchExpression, MatchType, MatchFlags
Modified: twext/trunk/twext/who/test/test_index.py
===================================================================
--- 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)
@@ -21,12 +21,11 @@
from twisted.trial import unittest
from twisted.internet.defer import inlineCallbacks, returnValue
-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
+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
Modified: twext/trunk/twext/who/test/test_util.py
===================================================================
--- 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)
@@ -21,12 +21,12 @@
from itertools import chain
from twisted.trial import unittest
-from twisted.python.constants import Names, NamedConstant
-from twisted.python.constants import Flags, FlagConstant
+from twisted.python.constants import (
+ Names, NamedConstant, Flags, FlagConstant,
+)
-from twext.who.idirectory import DirectoryServiceError
-from twext.who.util import ConstantsContainer
-from twext.who.util import uniqueResult, describe
+from ..idirectory import DirectoryServiceError
+from ..util import ConstantsContainer, uniqueResult, describe
Modified: twext/trunk/twext/who/test/test_xml.py
===================================================================
--- 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)
@@ -26,12 +26,13 @@
from twisted.python.filepath import FilePath
from twisted.internet.defer import inlineCallbacks
-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
+from ..idirectory import NoSuchRecordError
+from ..expression import (
+ CompoundExpression, Operand,
+ MatchExpression, MatchType, MatchFlags
+)
+from ..xml import ParseError, DirectoryService, DirectoryRecord
+from . import test_index
Modified: twext/trunk/twext/who/util.py
===================================================================
--- 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)
@@ -26,10 +26,11 @@
"iterFlags",
]
-from twisted.python.constants import Names, Values, Flags
-from twisted.python.constants import NamedConstant, ValueConstant, FlagConstant
+from twisted.python.constants import (
+ Names, Values, Flags, NamedConstant, ValueConstant, FlagConstant,
+)
-from twext.who.idirectory import DirectoryServiceError
+from .idirectory import DirectoryServiceError
Modified: twext/trunk/twext/who/xml.py
===================================================================
--- 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)
@@ -30,20 +30,23 @@
from time import time
from uuid import UUID
-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
+from xml.etree.ElementTree import (
+ parse as parseXML, ParseError as XMLParseError,
+ tostring as etreeToString, Element as XMLElement,
+)
from twisted.python.constants import Values, ValueConstant
from twisted.internet.defer import fail
-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
+from .idirectory import (
+ DirectoryServiceError,
+ NoSuchRecordError, UnknownRecordTypeError,
+ RecordType, FieldName as BaseFieldName,
+)
+from .index import (
+ DirectoryService as BaseDirectoryService,
+ DirectoryRecord, FieldName as IndexFieldName,
+)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140312/9a0778ef/attachment.html>
More information about the calendarserver-changes
mailing list