[Checkins] SVN: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/ Import normalization.

[Tres Seaver]

Log message for revision 125650:
  Import normalization.
  
  Move BBB imports to '_compat'.

Changed:
  U   zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_compat.py
  U   zope.schema/branches/tseaver-test_cleanup/src/zope/schema/vocabulary.py

-=-
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_compat.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_compat.py	2012-05-04 23:14:40 UTC (rev 125649)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_compat.py	2012-05-04 23:14:45 UTC (rev 125650)
@@ -2,6 +2,11 @@
 
 PY3 = sys.version_info[0] >= 3
 
+try:
+    from collections import OrderedDict
+except ImportError: #pragma NO COVER
+    from ordereddict import OrderedDict
+
 if PY3: #pragma NO COVER
     import builtins
     def b(s):

Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/vocabulary.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/vocabulary.py	2012-05-04 23:14:40 UTC (rev 125649)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/vocabulary.py	2012-05-04 23:14:45 UTC (rev 125650)
@@ -13,17 +13,15 @@
 ##############################################################################
 """Vocabulary support for schema.
 """
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
 
-from zope.interface.declarations import directlyProvides, implementer
-from zope.schema.interfaces import ValidationError
-from zope.schema.interfaces import IVocabularyRegistry
-from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
+from zope.interface import directlyProvides
+from zope.interface import implementer
+from zope.schema.interfaces import ITitledTokenizedTerm
+from zope.schema.interfaces import ITokenizedTerm
 from zope.schema.interfaces import ITreeVocabulary
-from zope.schema.interfaces import ITokenizedTerm, ITitledTokenizedTerm
+from zope.schema.interfaces import IVocabularyRegistry
+from zope.schema.interfaces import IVocabularyTokenized
+from zope.schema._compat import OrderedDict
 
 # simple vocabularies performing enumerated-like tasks
 _marker = object()