mucky merge

.gitignore

@@ -12,3 +12,7 @@ parts
 .coverage
 nosetests.xml
 coverage.xml
+devel
+include
+lib
+local

CHANGES.rst

@@ -1,11 +1,36 @@
 zope.schema Changelog
 =====================
 
-4.3.3 (unreleased)
+4.4.1 (unreleased)
 ------------------
 
-- Add the ability to swallow ValueErrors when rendering a SimpleVocabulary 
-  where the items may be duplicated. 
+- Nothing changed yet.
+
+
+4.4.0 (2014-01-22)
+------------------
+
+- Add an event on field properties to notify that a field has been updated.
+  This event enables definition of subscribers based on an event, a context
+  and a field. The event contains also the old value and the new value.
+  (also see package ``zope.schemaevent`` that define a field event handler)
+
+
+4.3.3 (2014-01-06)
+------------------
+
+- PEP 8 cleanup.
+
+- Don't raise RequiredMissing if a field's defaultFactory returns the field's
+  missing_value.
+
+- Updated ``boostrap.py`` to version 2.2.
+
+- Add the ability to swallow ValueErrors when rendering a SimpleVocabulary,
+  allowing for cases where vocabulary items may be duplicated (e.g., due to
+  user input).
+
+- It was a pain that ``ConstraintNotSatisfied`` did not tell the field name.
 
 
 4.3.2 (2013-02-24)
@@ -88,7 +113,7 @@ zope.schema Changelog
 
 - Fix broken Object field validation where the schema contains a Choice with
   ICountextSourceBinder source. In this case the vocabulary was not iterable
-  because the field was not bound and the source binder didn't return the 
+  because the field was not bound and the source binder didn't return the
   real vocabulary. Added simple test for IContextSourceBinder validation. But a
   test with an Object field with a schema using a Choice with
   IContextSourceBinder is still missing.
@@ -112,7 +137,7 @@ zope.schema Changelog
 
 - fix broken Object field validation. Previous version was using a volatile
   property on object field values which ends in a ForbiddenAttribute error
-  on security proxied objects. 
+  on security proxied objects.
 
 3.8.0 (2011-03-18)
 ------------------
@@ -186,15 +211,15 @@ zope.schema Changelog
 
 - Extend validation error to hold the field name.
 
-- Add FieldProperty class that uses Field.get and Field.set methods 
+- Add FieldProperty class that uses Field.get and Field.set methods
   instead of storing directly on the instance __dict__.
 
 3.5.4 (2009-03-25)
 ------------------
 
 - Don't fail trying to validate default value for Choice fields with
   IContextSourceBinder object given as a source. See
-  https://bugs.launchpad.net/zope3/+bug/340416. 
+  https://bugs.launchpad.net/zope3/+bug/340416.
 
 - Add an interface for ``DottedName`` field.
 

MANIFEST.in

@@ -8,3 +8,9 @@ global-exclude *.dll
 global-exclude *.pyc
 global-exclude *.pyo
 global-exclude *.so
+
+# added by check_manifest.py
+include *.py
+include .travis.yml
+include buildout.cfg
+include tox.ini