[Checkins] SVN: zope.schema/branches/tseaver-test_cleanup/ Drop the 'six' dependency; use a much-trimmed 'zope.schema._compat' module.
Tres Seaver
cvs-admin at zope.org
Fri Apr 20 15:09:30 UTC 2012
Log message for revision 125204:
Drop the 'six' dependency; use a much-trimmed 'zope.schema._compat' module.
Changed:
U zope.schema/branches/tseaver-test_cleanup/CHANGES.txt
U zope.schema/branches/tseaver-test_cleanup/setup.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/README.txt
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_bootstrapfields.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_field.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_messageid.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/fields.txt
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/interfaces.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/sources.txt
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/__init__.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/states.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_accessors.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_boolfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_choice.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_containerfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_date.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_datetime.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_decimalfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dictfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dotted_name.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_equality.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_field.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_fieldproperty.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_floatfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_interfacefield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_intfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_iterablefield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_objectfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_schema.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_states.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_strfield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_timedelta.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py
U zope.schema/branches/tseaver-test_cleanup/src/zope/schema/validation.txt
-=-
Modified: zope.schema/branches/tseaver-test_cleanup/CHANGES.txt
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/CHANGES.txt 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/CHANGES.txt 2012-04-20 15:09:27 UTC (rev 125204)
@@ -5,6 +5,9 @@
4.1.2 (unreleased)
------------------
+- Dropped the external ``six`` dependency in favor of a much-trimmed
+ ``zope.schema._compat`` module.
+
- Tests now pass when run under ``nose``.
- Added ``setup.py dev`` alias (runs ``setup.py develop`` plus installs
Modified: zope.schema/branches/tseaver-test_cleanup/setup.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/setup.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/setup.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -65,7 +65,6 @@
'setuptools',
'zope.interface >= 3.6.0',
'zope.event',
- 'six',
]
if sys.version_info < (2, 7):
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/README.txt
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/README.txt 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/README.txt 2012-04-20 15:09:27 UTC (rev 125204)
@@ -35,7 +35,7 @@
>>> import zope.interface
>>> import zope.schema
- >>> from six import u, b
+ >>> from zope.schema._compat import u, b
>>> class IBookmark(zope.interface.Interface):
... title = zope.schema.TextLine(
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_bootstrapfields.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_bootstrapfields.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_bootstrapfields.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -17,17 +17,27 @@
import sys
-from six import u, b, text_type, integer_types
-from zope.interface import Attribute, providedBy, implementer
-from zope.schema._bootstrapinterfaces import StopValidation
+from zope.interface import Attribute
+from zope.interface import providedBy
+from zope.interface import implementer
+
+from zope.schema._bootstrapinterfaces import ConstraintNotSatisfied
+from zope.schema._bootstrapinterfaces import IContextAwareDefaultFactory
from zope.schema._bootstrapinterfaces import IFromUnicode
-from zope.schema._bootstrapinterfaces import RequiredMissing, WrongType
-from zope.schema._bootstrapinterfaces import ConstraintNotSatisfied
-from zope.schema._bootstrapinterfaces import NotAContainer, NotAnIterator
-from zope.schema._bootstrapinterfaces import TooSmall, TooBig
-from zope.schema._bootstrapinterfaces import TooShort, TooLong
from zope.schema._bootstrapinterfaces import InvalidValue
-from zope.schema._bootstrapinterfaces import IContextAwareDefaultFactory
+from zope.schema._bootstrapinterfaces import NotAContainer
+from zope.schema._bootstrapinterfaces import NotAnIterator
+from zope.schema._bootstrapinterfaces import RequiredMissing
+from zope.schema._bootstrapinterfaces import StopValidation
+from zope.schema._bootstrapinterfaces import TooBig
+from zope.schema._bootstrapinterfaces import TooLong
+from zope.schema._bootstrapinterfaces import TooShort
+from zope.schema._bootstrapinterfaces import TooSmall
+from zope.schema._bootstrapinterfaces import WrongType
+from zope.schema._compat import u
+from zope.schema._compat import b # used in docstring doctests
+from zope.schema._compat import text_type
+from zope.schema._compat import integer_types
from zope.schema._schema import getFields
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_field.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_field.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_field.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -13,48 +13,93 @@
##############################################################################
"""Schema Fields
"""
-
__docformat__ = 'restructuredtext'
+from datetime import datetime
+from datetime import date
+from datetime import timedelta
+from datetime import time
+import decimal
import re
-import decimal
import threading
-from datetime import datetime, date, timedelta, time
+
from zope.event import notify
+from zope.interface import classImplements
+from zope.interface import implementer
+from zope.interface import Interface
+from zope.interface.interfaces import IInterface
+from zope.interface.interfaces import IMethod
-from zope.interface import classImplements, implementer, Interface
-from zope.interface.interfaces import IInterface, IMethod
-from six import u, b, text_type, string_types, binary_type, PY3
-
+from zope.schema.interfaces import IASCII
+from zope.schema.interfaces import IASCIILine
+from zope.schema.interfaces import IBaseVocabulary
+from zope.schema.interfaces import IBeforeObjectAssignedEvent
+from zope.schema.interfaces import IBool
+from zope.schema.interfaces import IBytes
+from zope.schema.interfaces import IBytesLine
+from zope.schema.interfaces import IChoice
+from zope.schema.interfaces import IContextSourceBinder
+from zope.schema.interfaces import IDate
+from zope.schema.interfaces import IDatetime
+from zope.schema.interfaces import IDecimal
+from zope.schema.interfaces import IDict
+from zope.schema.interfaces import IDottedName
from zope.schema.interfaces import IField
-from zope.schema.interfaces import IMinMaxLen, IText, ITextLine
+from zope.schema.interfaces import IFloat
+from zope.schema.interfaces import IFromUnicode
+from zope.schema.interfaces import IFrozenSet
+from zope.schema.interfaces import IId
+from zope.schema.interfaces import IInt
+from zope.schema.interfaces import IInterfaceField
+from zope.schema.interfaces import IList
+from zope.schema.interfaces import IMinMaxLen
+from zope.schema.interfaces import IObject
+from zope.schema.interfaces import IPassword
+from zope.schema.interfaces import ISet
+from zope.schema.interfaces import ISource
from zope.schema.interfaces import ISourceText
-from zope.schema.interfaces import IInterfaceField
-from zope.schema.interfaces import IBytes, IASCII, IBytesLine, IASCIILine
-from zope.schema.interfaces import IBool, IInt, IFloat, IDatetime, IFrozenSet
-from zope.schema.interfaces import IChoice, ITuple, IList, ISet, IDict
-from zope.schema.interfaces import IPassword, IDate, ITimedelta
-from zope.schema.interfaces import IObject, IBeforeObjectAssignedEvent
-from zope.schema.interfaces import ITime, IDecimal
-from zope.schema.interfaces import IURI, IId, IDottedName, IFromUnicode
-from zope.schema.interfaces import ISource, IBaseVocabulary
-from zope.schema.interfaces import IContextSourceBinder
+from zope.schema.interfaces import IText
+from zope.schema.interfaces import ITextLine
+from zope.schema.interfaces import ITime
+from zope.schema.interfaces import ITimedelta
+from zope.schema.interfaces import ITuple
+from zope.schema.interfaces import IURI
-from zope.schema.interfaces import ValidationError, InvalidValue
-from zope.schema.interfaces import WrongType, WrongContainedType, NotUnique
-from zope.schema.interfaces import SchemaNotProvided, SchemaNotFullyImplemented
-from zope.schema.interfaces import InvalidURI, InvalidId, InvalidDottedName
+from zope.schema.interfaces import ValidationError
+from zope.schema.interfaces import InvalidValue
+from zope.schema.interfaces import WrongType
+from zope.schema.interfaces import WrongContainedType
+from zope.schema.interfaces import NotUnique
+from zope.schema.interfaces import SchemaNotProvided
+from zope.schema.interfaces import SchemaNotFullyImplemented
+from zope.schema.interfaces import InvalidURI
+from zope.schema.interfaces import InvalidId
+from zope.schema.interfaces import InvalidDottedName
from zope.schema.interfaces import ConstraintNotSatisfied
-from zope.schema._bootstrapfields import Field, Container, Iterable, Orderable
-from zope.schema._bootstrapfields import Text, TextLine, Bool, Int, Password
+from zope.schema._bootstrapfields import Field
+from zope.schema._bootstrapfields import Container
+from zope.schema._bootstrapfields import Iterable
+from zope.schema._bootstrapfields import Orderable
+from zope.schema._bootstrapfields import Text
+from zope.schema._bootstrapfields import TextLine
+from zope.schema._bootstrapfields import Bool
+from zope.schema._bootstrapfields import Int
+from zope.schema._bootstrapfields import Password
from zope.schema._bootstrapfields import MinMaxLen
from zope.schema.fieldproperty import FieldProperty
from zope.schema.vocabulary import getVocabularyRegistry
from zope.schema.vocabulary import VocabularyRegistryError
from zope.schema.vocabulary import SimpleVocabulary
+from zope.schema._compat import u # used in docstring doctests
+from zope.schema._compat import b
+from zope.schema._compat import text_type
+from zope.schema._compat import string_types
+from zope.schema._compat import binary_type
+from zope.schema._compat import PY3
+
# Fix up bootstrap field types
Field.title = FieldProperty(IField['title'])
Field.description = FieldProperty(IField['description'])
@@ -86,7 +131,7 @@
_type = binary_type
- def fromUnicode(self, u):
+ def fromUnicode(self, uc):
"""
>>> obj = Bytes(constraint=lambda v: b('x') in v)
@@ -99,9 +144,9 @@
"""
if PY3:
- v = b(u)
+ v = b(uc)
else:
- v = str(u)
+ v = str(uc)
self.validate(v)
return v
@@ -173,7 +218,7 @@
def __init__(self, *args, **kw):
super(Float, self).__init__(*args, **kw)
- def fromUnicode(self, u):
+ def fromUnicode(self, uc):
"""
>>> f = Float()
>>> f.fromUnicode("1.25")
@@ -183,7 +228,7 @@
...
ValueError: invalid literal for float(): 1.25.6
"""
- v = float(u)
+ v = float(uc)
self.validate(v)
return v
@@ -196,7 +241,7 @@
def __init__(self, *args, **kw):
super(Decimal, self).__init__(*args, **kw)
- def fromUnicode(self, u):
+ def fromUnicode(self, uc):
"""
>>> f = Decimal()
>>> import decimal
@@ -210,9 +255,9 @@
ValueError: invalid literal for Decimal(): 1.25.6
"""
try:
- v = decimal.Decimal(u)
+ v = decimal.Decimal(uc)
except decimal.InvalidOperation:
- raise ValueError('invalid literal for Decimal(): %s' % u)
+ raise ValueError('invalid literal for Decimal(): %s' % uc)
self.validate(v)
return v
@@ -360,19 +405,19 @@
To illustrate, we'll use a text value type. All values must be unicode.
- >>> field = TextLine(required=True)
+ >>> field = TextLine(required=True)
- To validate a sequence of various values:
+ To validate a sequence of various values:
- >>> errors = _validate_sequence(field, (b('foo'), u('bar'), 1))
- >>> errors
- [WrongType(b'foo', <type 'unicode'>, ''), WrongType(1, <type 'unicode'>, '')]
+ >>> errors = _validate_sequence(field, (b('foo'), u('bar'), 1))
+ >>> errors
+ [WrongType(b'foo', <type 'unicode'>, ''), WrongType(1, <type 'unicode'>, '')]
- The only valid value in the sequence is the second item. The others
- generated errors.
+ The only valid value in the sequence is the second item. The others
+ generated errors.
- We can use the optional errors argument to collect additional errors
- for a new sequence:
+ We can use the optional errors argument to collect additional errors
+ for a new sequence:
>>> errors = _validate_sequence(field, (2, u('baz')), errors)
>>> errors
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_messageid.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_messageid.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/_messageid.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -14,8 +14,7 @@
try:
from zope.i18nmessageid import MessageFactory
-except ImportError:
- from six import text_type
- _ = lambda x: text_type(x)
-else:
+except ImportError: #pragma NO COVER
+ from zope.schema._compat import text_type as _
+else: #pragma NO COVER
_ = MessageFactory("zope")
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/fields.txt
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/fields.txt 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/fields.txt 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
>>> from zope.interface import Interface
>>> from zope.schema import List, Float
- >>> from six import u
+ >>> from zope.schema._compat import u
>>> class IInventoryItem(Interface):
... pricePoints = List(
... title=u("Price Points"),
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/interfaces.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/interfaces.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/interfaces.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -17,9 +17,7 @@
from zope.interface import Interface, Attribute
from zope.interface.common.mapping import IEnumerableMapping
-from six import u, PY3
-from zope.schema._messageid import _
# Import from _bootstrapinterfaces only because other packages will expect
# to find these interfaces here.
@@ -45,7 +43,11 @@
from zope.schema._bootstrapinterfaces import InvalidValue
from zope.schema._bootstrapinterfaces import IContextAwareDefaultFactory
+from zope.schema._compat import PY3
+from zope.schema._compat import u
+from zope.schema._messageid import _
+
class WrongContainedType(ValidationError):
__doc__ = _("""Wrong contained type""")
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/sources.txt
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/sources.txt 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/sources.txt 2012-04-20 15:09:27 UTC (rev 125204)
@@ -60,7 +60,7 @@
`bind` method will be called with the context as its only argument. The
result must implement ISource and will be used as the source.
- >>> from six import print_
+ >>> from zope.schema._compat import print_
>>> def my_binder(context):
... print_("Binder was called.")
... source = MySource()
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/__init__.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/__init__.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/__init__.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -3,7 +3,7 @@
import re
-from six import PY3
+from zope.schema._compat import PY3
from zope.testing import renormalizing
if PY3:
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/states.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/states.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/states.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -13,7 +13,7 @@
##############################################################################
"""Sample vocabulary supporting state abbreviations.
"""
-from six import u
+from zope.schema._compat import u
from zope.interface import implementer
from zope.schema import interfaces
from zope.schema import Choice
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_accessors.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_accessors.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_accessors.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -19,7 +19,7 @@
class Test(unittest.TestCase):
def test(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.interface import implementer
from zope.interface.interfaces import IMethod
@@ -90,7 +90,7 @@
self.assertEqual(instance.set, 1)
def test_doc(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.interface.document import asStructuredText
from zope.schema import Text
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_boolfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_boolfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_boolfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Bool
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Bool field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -34,7 +34,7 @@
field.validate(False)
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Bool field'), description=u(''),
readonly=False, required=True)
@@ -44,7 +44,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testIBoolIsMoreImportantThanIFromUnicode(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.interface.adapter import AdapterRegistry
from zope.schema.interfaces import IBool
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_choice.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_choice.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_choice.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -41,7 +41,7 @@
self.assertRaises(ConstraintNotSatisfied, choice.validate, 4)
def test_validate_string(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import ConstraintNotSatisfied
choice = self._makeOne(values=['a', 'c'])
choice.validate('a')
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_containerfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_containerfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_containerfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -29,7 +29,7 @@
from UserDict import UserDict
except ImportError: #pragma NO COVER python3
from collections import UserDict
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import NotAContainer
field = self._makeOne(title=u('test field'), description=u(''),
readonly=False, required=False)
@@ -44,7 +44,7 @@
self.assertRaises(NotAContainer, field.validate, True)
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('test field'), description=u(''),
readonly=False, required=True)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_date.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_date.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_date.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -31,7 +31,7 @@
def testValidate(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import WrongType
field = self._makeOne(title=u('Date field'), description=u(''),
readonly=False, required=False)
@@ -41,7 +41,7 @@
def testValidateRequired(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Date field'), description=u(''),
readonly=False, required=True)
@@ -52,7 +52,7 @@
def testValidateMin(self):
from datetime import date
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
d1 = date(2000,10,1)
d2 = date(2000,10,2)
@@ -67,7 +67,7 @@
def testValidateMax(self):
from datetime import date
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
d1 = date(2000,10,1)
d2 = date(2000,10,2)
@@ -82,7 +82,7 @@
def testValidateMinAndMax(self):
from datetime import date
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
d1 = date(2000,10,1)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_datetime.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_datetime.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_datetime.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
def testValidate(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Datetime field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -34,7 +34,7 @@
def testValidateRequired(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Datetime field'), description=u(''),
readonly=False, required=True)
@@ -44,7 +44,7 @@
def testValidateMin(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
d1 = datetime(2000,10,1)
d2 = datetime(2000,10,2)
@@ -59,7 +59,7 @@
def testValidateMax(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
d1 = datetime(2000,10,1)
d2 = datetime(2000,10,2)
@@ -74,7 +74,7 @@
def testValidateMinAndMax(self):
from datetime import datetime
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
d1 = datetime(2000,10,1)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_decimalfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_decimalfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_decimalfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -27,7 +27,7 @@
def testValidate(self):
import decimal
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Decimal field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -37,7 +37,7 @@
def testValidateRequired(self):
import decimal
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Decimal field'), description=u(''),
readonly=False, required=True)
@@ -49,7 +49,7 @@
def testValidateMin(self):
import decimal
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Decimal field'), description=u(''),
readonly=False, required=False,
@@ -63,7 +63,7 @@
def testValidateMax(self):
import decimal
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
field = self._makeOne(title=u('Decimal field'), description=u(''),
readonly=False, required=False,
@@ -77,7 +77,7 @@
def testValidateMinAndMax(self):
import decimal
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Decimal field'), description=u(''),
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dictfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dictfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dictfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Dict
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Dict field'),
description=u(''), readonly=False, required=False)
field.validate(None)
@@ -35,7 +35,7 @@
field.validate({'a': 1})
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Dict field'),
description=u(''), readonly=False, required=True)
@@ -46,7 +46,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testValidateMinValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Dict field'),
description=u(''), readonly=False, required=False,
@@ -58,7 +58,7 @@
self.assertRaises(TooShort, field.validate, {})
def testValidateMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(title=u('Dict field'),
description=u(''), readonly=False, required=False,
@@ -71,7 +71,7 @@
self.assertRaises(TooLong, field.validate, {1: 'a', 2: 'b', 3: 'c'})
def testValidateMinValuesAndMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Dict field'),
@@ -85,7 +85,7 @@
self.assertRaises(TooLong, field.validate, {1: 'a', 2: 'b', 3: 'c'})
def testValidateValueType(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('Dict field'),
@@ -100,7 +100,7 @@
self.assertRaises(WrongContainedType, field.validate, {'a': ()} )
def testValidateKeyTypes(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('Dict field'),
@@ -116,7 +116,7 @@
def test_bind_binds_key_and_value_types(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
field = self._makeOne(
__name__ = 'x',
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dotted_name.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dotted_name.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_dotted_name.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -51,7 +51,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testFromUnicode(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne()
self.assertEquals(field.fromUnicode(u('foo')), 'foo')
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_equality.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_equality.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_equality.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -20,7 +20,7 @@
def test_equality(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema import Text
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_field.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_field.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_field.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -25,7 +25,7 @@
return self._getTargetClass()(*args, **kw)
def test_bind(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
field = self._makeOne(
__name__ = 'x',
@@ -49,7 +49,7 @@
self.assertEqual(getattr(field2, n), getattr(field, n), n)
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(
title=u('Not required field'), description=u(''),
readonly=False, required=False)
@@ -60,7 +60,7 @@
field.validate('')
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(
title=u('Required field'), description=u(''),
@@ -75,7 +75,7 @@
class CollectionFieldTestBase(FieldTestBase):
def test_bind_binds_value_type(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
field = self._makeOne(
__name__ = 'x',
@@ -100,7 +100,7 @@
return Field
def test__doc__(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u("test fiield"),
description=(
u("To make sure that\n"
@@ -131,7 +131,7 @@
self.assertTrue(S2['a'].order > S2['b'].order)
def testConstraint(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import ConstraintNotSatisfied
def isodd(x):
@@ -180,7 +180,7 @@
class FieldDefaultBehaviour(unittest.TestCase):
def test_required_defaults_to_true(self):
from zope.schema import Field
- from six import u
+ from zope.schema._compat import u
class MyField(Field):
pass
field = MyField(title=u('my'))
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_fieldproperty.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_fieldproperty.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_fieldproperty.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -20,8 +20,8 @@
class Test(unittest.TestCase):
def _getSchema(self):
- from six import b
- from six import u
+ from zope.schema._compat import b
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.schema import Bytes
from zope.schema import Float
@@ -52,8 +52,8 @@
return self._getTargetClass()()
def test_basic(self):
- from six import b
- from six import u
+ from zope.schema._compat import b
+ from zope.schema._compat import u
from zope.schema.interfaces import ValidationError
c = self._makeOne()
self.assertEqual(c.title, u('say something'))
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_floatfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_floatfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_floatfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Float
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Float field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -35,7 +35,7 @@
field.validate(1000.0003)
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Float field'), description=u(''),
readonly=False, required=True)
@@ -46,7 +46,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testValidateMin(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Float field'), description=u(''),
readonly=False, required=False, min=10.5)
@@ -58,7 +58,7 @@
self.assertRaises(TooSmall, field.validate, 10.4)
def testValidateMax(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
field = self._makeOne(title=u('Float field'), description=u(''),
readonly=False, required=False, max=10.5)
@@ -70,7 +70,7 @@
self.assertRaises(TooBig, field.validate, 20.7)
def testValidateMinAndMax(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Float field'), description=u(''),
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_interfacefield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_interfacefield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_interfacefield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -25,7 +25,7 @@
return InterfaceField
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.schema.interfaces import WrongType
@@ -38,7 +38,7 @@
self.assertRaises(WrongType, field.validate, object())
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Interface field'), description=u(''),
readonly=False, required=True)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_intfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_intfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_intfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Int
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Int field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -35,7 +35,7 @@
field.validate(-1)
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Int field'), description=u(''),
readonly=False, required=True)
@@ -46,7 +46,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testValidateMin(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Int field'), description=u(''),
readonly=False, required=False, min=10)
@@ -58,7 +58,7 @@
self.assertRaises(TooSmall, field.validate, -10)
def testValidateMax(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
field = self._makeOne(title=u('Int field'), description=u(''),
readonly=False, required=False, max=10)
@@ -71,7 +71,7 @@
self.assertRaises(TooBig, field.validate, 20)
def testValidateMinAndMax(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
field = self._makeOne(title=u('Int field'), description=u(''),
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_iterablefield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_iterablefield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_iterablefield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -33,7 +33,7 @@
IterableUserDict = UserDict
else: #pragma NO COVER python2
from UserDict import IterableUserDict
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import NotAContainer
from zope.schema.interfaces import NotAnIterator
field = self._makeOne(title=u('test field'), description=u(''),
@@ -50,7 +50,7 @@
self.assertRaises(NotAnIterator, field.validate, UserDict)
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('test field'), description=u(''),
readonly=False, required=True)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_listfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return List
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('List field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -35,7 +35,7 @@
field.validate([3,])
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('List field'), description=u(''),
readonly=False, required=True)
@@ -46,7 +46,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testValidateMinValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('List field'), description=u(''),
readonly=False, required=False, min_length=2)
@@ -58,7 +58,7 @@
self.assertRaises(TooShort, field.validate, [1,])
def testValidateMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(title=u('List field'), description=u(''),
readonly=False, required=False, max_length=2)
@@ -70,7 +70,7 @@
self.assertRaises(TooLong, field.validate, [1, 2, 3])
def testValidateMinValuesAndMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('List field'), description=u(''),
@@ -84,7 +84,7 @@
self.assertRaises(TooLong, field.validate, [1, 2, 3])
def testValidateValueTypes(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('List field'), description=u(''),
@@ -116,7 +116,7 @@
self._makeOne(value_type=FakeField())
def testUnique(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import NotUnique
field = self._makeOne(title=u('test field'), description=u(''),
readonly=False, required=True, unique=True)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_objectfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_objectfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_objectfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -32,7 +32,7 @@
return super(ObjectTest, self)._makeOne(**kw)
def _makeSchema(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Attribute
from zope.interface import Interface
from zope.schema import TextLine
@@ -67,7 +67,7 @@
self.fail('Expected WrongContainedType Error')
def makeTestData(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import implementer
schema = self._makeSchema()
@@ -148,7 +148,7 @@
pass
def test_validate_required(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(
title=u('Required field'), description=u(''),
@@ -196,7 +196,7 @@
self.assertTrue(isinstance(errors[0], SchemaNotFullyImplemented))
def test_validate_with_non_object_value(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.interface import implementer
from zope.schema import Object
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_schema.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_schema.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_schema.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -19,8 +19,8 @@
class SchemaTest(unittest.TestCase):
def _makeSchema(self):
- from six import b
- from six import u
+ from zope.schema._compat import b
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.schema import Bytes
@@ -43,8 +43,8 @@
return ISchemaTest
def _makeDerivedSchema(self):
- from six import b
- from six import u
+ from zope.schema._compat import b
+ from zope.schema._compat import u
from zope.schema import Bytes
class ISchemaTestSubclass(self._makeSchema()):
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_setfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Set
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import WrongType
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=False)
@@ -46,7 +46,7 @@
self.assertRaises(WrongType, field.validate, frozenset((1, 2, 3)))
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=True)
@@ -78,7 +78,7 @@
field.default = missing
def testValidateMinValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=False, min_length=2)
@@ -94,7 +94,7 @@
self.assertRaises(TooShort, field.validate, set((3,)))
def testValidateMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=False, max_length=2)
@@ -110,7 +110,7 @@
self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
def testValidateMinValuesAndMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Set field'), description=u(''),
@@ -128,7 +128,7 @@
self.assertRaises(TooLong, field.validate, set((1, 2, 3)))
def testValidateValueTypes(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('Set field'), description=u(''),
@@ -191,7 +191,7 @@
return FrozenSet
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import WrongType
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=False)
@@ -209,7 +209,7 @@
self.assertRaises(WrongType, field.validate, set((1, 2, 3)))
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Set field'), description=u(''),
readonly=False, required=True)
@@ -237,7 +237,7 @@
field.default = missing
def testValidateMinValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('FrozenSet field'), description=u(''),
readonly=False, required=False, min_length=2)
@@ -249,7 +249,7 @@
self.assertRaises(TooShort, field.validate, frozenset((3,)))
def testValidateMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(title=u('FrozenSet field'), description=u(''),
readonly=False, required=False, max_length=2)
@@ -261,7 +261,7 @@
self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
def testValidateMinValuesAndMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('FrozenSet field'), description=u(''),
@@ -275,7 +275,7 @@
self.assertRaises(TooLong, field.validate, frozenset((1, 2, 3)))
def testValidateValueTypes(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('FrozenSet field'), description=u(''),
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_states.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_states.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_states.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -31,7 +31,7 @@
_clear()
def _makeSchema(self):
- from six import u
+ from zope.schema._compat import u
from zope.interface import Interface
from zope.schema import Choice
from zope.schema.tests.states import StateVocabulary
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_strfield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_strfield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_strfield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -22,7 +22,7 @@
"""Test the Str Field."""
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Str field'), description=u(''),
readonly=False, required=False)
field.validate(None)
@@ -30,7 +30,7 @@
field.validate(self._convert(''))
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
from zope.schema.interfaces import TooShort
# Note that if we want to require non-empty strings,
@@ -45,7 +45,7 @@
self.assertRaises(TooShort, field.validate, self._convert(''))
def testValidateMinLength(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(
title=u('Str field'), description=u(''),
@@ -59,7 +59,7 @@
self.assertRaises(TooShort, field.validate, self._convert('1'))
def testValidateMaxLength(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(
title=u('Str field'), description=u(''),
@@ -73,7 +73,7 @@
self.assertRaises(TooLong, field.validate, self._convert('999999999'))
def testValidateMinLengthAndMaxLength(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(
@@ -95,7 +95,7 @@
class MultiLine(object):
def test_newlines(self):
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Str field'))
field.validate(self._convert('hello\nworld'))
@@ -107,11 +107,11 @@
return Bytes
def _convert(self, v):
- from six import b
+ from zope.schema._compat import b
return b(v)
def testBadStringType(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import ValidationError
field = self._makeOne()
self.assertRaises(ValidationError, field.validate, u('hello'))
@@ -124,24 +124,24 @@
return Text
def _convert(self, v):
- from six import u
+ from zope.schema._compat import u
return u(v)
def testBadStringType(self):
- from six import b
+ from zope.schema._compat import b
from zope.schema.interfaces import ValidationError
field = self._makeOne()
self.assertRaises(ValidationError, field.validate, b('hello'))
def testSillyDefault(self):
- from six import b
+ from zope.schema._compat import b
from zope.schema.interfaces import ValidationError
self.assertRaises(ValidationError, self._makeOne, default=b(""))
class SingleLine(object):
def test_newlines(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import ConstraintNotSatisfied
field = self._makeOne(title=u('Str field'))
self.assertRaises(ConstraintNotSatisfied,
@@ -155,7 +155,7 @@
return Password
def test_existingValue(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import WrongType
class Dummy(object):
password = None
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_timedelta.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_timedelta.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_timedelta.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -32,7 +32,7 @@
def testValidate(self):
from datetime import timedelta
- from six import u
+ from zope.schema._compat import u
field = self._makeOne(title=u('Timedelta field'),
description=u(''),
readonly=False, required=False)
@@ -41,7 +41,7 @@
def testValidateRequired(self):
from datetime import timedelta
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Timedelta field'), description=u(''),
readonly=False, required=True)
@@ -51,7 +51,7 @@
def testValidateMin(self):
from datetime import timedelta
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooSmall
t1 = timedelta(hours=2)
t2 = timedelta(hours=3)
@@ -66,7 +66,7 @@
def testValidateMax(self):
from datetime import timedelta
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
t1 = timedelta(minutes=1)
t2 = timedelta(minutes=2)
@@ -82,7 +82,7 @@
def testValidateMinAndMax(self):
from datetime import timedelta
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooBig
from zope.schema.interfaces import TooSmall
t1 = timedelta(days=1)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/tests/test_tuplefield.py 2012-04-20 15:09:27 UTC (rev 125204)
@@ -26,7 +26,7 @@
return Tuple
def testValidate(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import WrongType
field = self._makeOne(title=u('Tuple field'), description=u(''),
readonly=False, required=False)
@@ -41,7 +41,7 @@
self.assertRaises(WrongType, field.validate, {})
def testValidateRequired(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import RequiredMissing
field = self._makeOne(title=u('Tuple field'), description=u(''),
readonly=False, required=True)
@@ -52,7 +52,7 @@
self.assertRaises(RequiredMissing, field.validate, None)
def testValidateMinValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Tuple field'), description=u(''),
readonly=False, required=False, min_length=2)
@@ -64,7 +64,7 @@
self.assertRaises(TooShort, field.validate, (1,))
def testValidateMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
field = self._makeOne(title=u('Tuple field'), description=u(''),
readonly=False, required=False, max_length=2)
@@ -76,7 +76,7 @@
self.assertRaises(TooLong, field.validate, (1, 2, 3))
def testValidateMinValuesAndMaxValues(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import TooLong
from zope.schema.interfaces import TooShort
field = self._makeOne(title=u('Tuple field'), description=u(''),
@@ -90,7 +90,7 @@
self.assertRaises(TooLong, field.validate, (1, 2, 3))
def testValidateValueTypes(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema import Int
from zope.schema.interfaces import WrongContainedType
field = self._makeOne(title=u('Tuple field'), description=u(''),
@@ -122,7 +122,7 @@
self._makeOne(value_type=FakeField())
def testUnique(self):
- from six import u
+ from zope.schema._compat import u
from zope.schema.interfaces import NotUnique
field = self._makeOne(title=u('test field'), description=u(''),
readonly=False, required=True, unique=True)
Modified: zope.schema/branches/tseaver-test_cleanup/src/zope/schema/validation.txt
===================================================================
--- zope.schema/branches/tseaver-test_cleanup/src/zope/schema/validation.txt 2012-04-20 14:33:21 UTC (rev 125203)
+++ zope.schema/branches/tseaver-test_cleanup/src/zope/schema/validation.txt 2012-04-20 15:09:27 UTC (rev 125204)
@@ -16,7 +16,7 @@
>>> import zope.interface
>>> import zope.schema
- >>> from six import print_
+ >>> from zope.schema._compat import print_
>>> class ITwoInts(zope.interface.Interface):
... a = zope.schema.Int(max=10)
... b = zope.schema.Int(min=5)
More information about the checkins
mailing list