Preparing release 4.3.2

zopefoundation · Feb 24, 2013 · f7a0e8e · f7a0e8e
1 parent 3f9fe36
commit f7a0e8e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -73,7 +73,7 @@ def emit(self, record):
 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
@@ -42,7 +42,7 @@ def __init__(self, value, token=None, title=None):
         # 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)