[Checkins] [zopefoundation/zope.schema] 30137e: handle the case where unicode is passed in as a to...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zope.schema
  Commit: 30137e0b63d7a8d397c1785e3867e161a780d160
      https://github.com/zopefoundation/zope.schema/commit/30137e0b63d7a8d397c1785e3867e161a780d160
  Author: Elizabeth Leddy <eleddy at umich.edu>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M src/zope/schema/vocabulary.py

  Log Message:
  -----------
  handle the case where unicode is passed in as a token.


  Commit: 325988baa2900a5a24d322699ada79fd3d25d2ee
      https://github.com/zopefoundation/zope.schema/commit/325988baa2900a5a24d322699ada79fd3d25d2ee
  Author: Elizabeth Leddy <eleddy at umich.edu>
  Date:   2014-03-10 (Mon, 10 Mar 2014)

  Changed paths:
    M .gitignore
    M CHANGES.rst
    M MANIFEST.in
    M bootstrap.py
    M buildout.cfg
    M setup.cfg
    M setup.py
    M src/zope/schema/__init__.py
    M src/zope/schema/_bootstrapfields.py
    M src/zope/schema/_bootstrapinterfaces.py
    M src/zope/schema/_compat.py
    M src/zope/schema/_field.py
    M src/zope/schema/_messageid.py
    M src/zope/schema/_schema.py
    M src/zope/schema/accessors.py
    M src/zope/schema/fieldproperty.py
    M src/zope/schema/interfaces.py
    M src/zope/schema/tests/states.py
    M src/zope/schema/tests/test__bootstrapfields.py
    M src/zope/schema/tests/test__bootstrapinterfaces.py
    M src/zope/schema/tests/test__field.py
    M src/zope/schema/tests/test_accessors.py
    M src/zope/schema/tests/test_equality.py
    M src/zope/schema/tests/test_fieldproperty.py
    M src/zope/schema/tests/test_interfaces.py
    M src/zope/schema/tests/test_schema.py
    M src/zope/schema/tests/test_states.py
    M src/zope/schema/tests/test_vocabulary.py
    M src/zope/schema/vocabulary.py

  Log Message:
  -----------
  mucky merge


Compare: https://github.com/zopefoundation/zope.schema/compare/1062f909de51...325988baa290