summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Richter <stephan.richter@gmail.com>2013-02-24 16:20:21 -0500
committerStephan Richter <stephan.richter@gmail.com>2013-02-24 16:20:21 -0500
commitf7a0e8efb7cd370b7fd8508aec76b123fa344cfb (patch)
tree7531e6246e87dbfe7f1cd77ec522e22b2c5c103b
parent3f9fe3688203b8ca18e9a8dadef4262ad1bebc21 (diff)
downloadzope-schema-4.3.2.tar.gz
Preparing release 4.3.24.3.2
-rw-r--r--CHANGES.rst5
-rw-r--r--setup.py2
-rw-r--r--src/zope/schema/vocabulary.py2
3 files changed, 5 insertions, 4 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index de93cc0..d317659 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,11 @@
zope.schema Changelog
=====================
-4.3.2 (unreleased)
+4.3.2 (2013-02-24)
------------------
-- Nothing changed yet.
+- Fix Python 2.6 support. (Forgot to run tox with all environments before last
+ release.)
4.3.1 (2013-02-24)
diff --git a/setup.py b/setup.py
index ddfb87c..66ab66e 100644
--- a/setup.py
+++ b/setup.py
@@ -73,7 +73,7 @@ if sys.version_info < (2, 7):
TESTS_REQUIRE = ['zope.testing']
setup(name='zope.schema',
- version='4.3.2.dev0',
+ version='4.3.2',
url='http://pypi.python.org/pypi/zope.schema',
license='ZPL 2.1',
description='zope.interface extension for defining data schemas',
diff --git a/src/zope/schema/vocabulary.py b/src/zope/schema/vocabulary.py
index a683e49..79d1321 100644
--- a/src/zope/schema/vocabulary.py
+++ b/src/zope/schema/vocabulary.py
@@ -42,7 +42,7 @@ class SimpleTerm(object):
# readable as possible.
self.token = str(token) \
if not isinstance(token, bytes) \
- else token.decode(errors='ignore')
+ else str(token.decode('ascii', 'ignore'))
self.title = title
if title is not None:
directlyProvides(self, ITitledTokenizedTerm)