Merge pull request #34 from plone/tomgross-nocmfdefault

remove CMFDefault dependency
plone · Apr 20, 2015 · 43666f8 · 43666f8
2 parents d7f9651 + 3511e15
commit 43666f8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ CHANGES
 2.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Removed CMFDefault dependency
+  [tomgross]
 
 
 2.2 (2015-03-13)

diff --git a/plone/app/users/schema.py b/plone/app/users/schema.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName
-from Products.CMFDefault.exceptions import EmailAddressInvalid
+from Products.CMFPlone.RegistrationTool import EmailAddressInvalid
 from Products.CMFPlone import PloneMessageFactory as _
 from ZTUtils import make_query
 from plone.autoform import directives as form

diff --git a/setup.py b/setup.py
@@ -47,7 +47,6 @@
         'AccessControl',
         'Acquisition',
         'Products.CMFCore',
-        'Products.CMFDefault',
         'Products.CMFPlone',
         'Products.PlonePAS',
         'Products.statusmessages',