Skip to content

Commit

Permalink
[fc] Repository: plone.app.users
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2015-04-20T21:09:27+02:00
Author: Tom Gross (tomgross) <itconsense@gmail.com>
Commit: plone/plone.app.users@3511e15

remove CMFDefault dependency

Files changed:
M CHANGES.rst
M plone/app/users/schema.py
M setup.py
Repository: plone.app.users
Branch: refs/heads/master
Date: 2015-04-21T01:27:04+02:00
Author: Gil Forcada Codinachs (gforcada) <gforcada@gnome.org>
Commit: plone/plone.app.users@43666f8

Merge pull request #34 from plone/tomgross-nocmfdefault

remove CMFDefault dependency

Files changed:
M CHANGES.rst
M plone/app/users/schema.py
M setup.py
  • Loading branch information
gforcada committed Apr 20, 2015
1 parent 36fdbe4 commit 768a731
Showing 1 changed file with 101 additions and 30 deletions.
131 changes: 101 additions & 30 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,39 +1,110 @@
Repository: plone.theme
Repository: plone.app.users
Branch: refs/heads/master
Date: 2015-04-20T23:44:40+02:00
Author: Gil Forcada (gforcada) <gforcada@gnome.org>
Commit: https://github.com/plone/plone.theme/commit/081c7851d15b6e4744d16b33bd04511356f61772
Date: 2015-04-20T21:09:27+02:00
Author: Tom Gross (tomgross) <itconsense@gmail.com>
Commit: https://github.com/plone/plone.app.users/commit/3511e15de87b6207ca31dc8c7c468863d887d61d

Fix more txt -&gt; rst
remove CMFDefault dependency

Files changed:
M plone/theme/tests/interfaces.py
M plone/theme/tests/test_doctest.py

diff --git a/plone/theme/tests/interfaces.py b/plone/theme/tests/interfaces.py
index 98751be..74abe3b 100644
--- a/plone/theme/tests/interfaces.py
+++ b/plone/theme/tests/interfaces.py
@@ -1,6 +1,6 @@
# A browser layer - you should make one of these for your own skin
# and register it with a name corresponding to a skin in portal_skins.
-# See tests.zcml and README.txt for more.
+# See tests.zcml and README.rst for more.
M CHANGES.rst
M plone/app/users/schema.py
M setup.py

diff --git a/CHANGES.rst b/CHANGES.rst
index 8b2e997..e18aa91 100644
--- 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
index 4b1a3c3..c8c6ce2 100644
--- 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
index e6a75c7..f7a3fe8 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,6 @@
'AccessControl',
'Acquisition',
'Products.CMFCore',
- 'Products.CMFDefault',
'Products.CMFPlone',
'Products.PlonePAS',
'Products.statusmessages',


Repository: plone.app.users
Branch: refs/heads/master
Date: 2015-04-21T01:27:04+02:00
Author: Gil Forcada Codinachs (gforcada) <gforcada@gnome.org>
Commit: https://github.com/plone/plone.app.users/commit/43666f8a76cde92e52bfd4c335de5593f2c8b2ed

Merge pull request #34 from plone/tomgross-nocmfdefault

remove CMFDefault dependency

Files changed:
M CHANGES.rst
M plone/app/users/schema.py
M setup.py

diff --git a/CHANGES.rst b/CHANGES.rst
index 8b2e997..e18aa91 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ CHANGES
2.2.1 (unreleased)
------------------

from plone.theme.interfaces import IDefaultPloneLayer
-- Nothing changed yet.
+- Removed CMFDefault dependency
+ [tomgross]

diff --git a/plone/theme/tests/test_doctest.py b/plone/theme/tests/test_doctest.py
index 5e69718..a3c6411 100644
--- a/plone/theme/tests/test_doctest.py
+++ b/plone/theme/tests/test_doctest.py
@@ -8,7 +8,7 @@

def test_suite():
return unittest.TestSuite(
- [layered(doctest.DocFileSuite('README.txt', package='plone.theme',
+ [layered(doctest.DocFileSuite('README.rst', package='plone.theme',
optionflags=doctest.ELLIPSIS | doctest.REPORT_ONLY_FIRST_FAILURE),
layer=PLONETHEME_FUNCTIONAL_TESTING)]
)
2.2 (2015-03-13)
diff --git a/plone/app/users/schema.py b/plone/app/users/schema.py
index 4b1a3c3..c8c6ce2 100644
--- 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
index e6a75c7..f7a3fe8 100644
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,6 @@
'AccessControl',
'Acquisition',
'Products.CMFCore',
- 'Products.CMFDefault',
'Products.CMFPlone',
'Products.PlonePAS',
'Products.statusmessages',


0 comments on commit 768a731

Please sign in to comment.