diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index a3a59f5..d341d4b 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,9 +1,13 @@ Changelog ========= +1.0 - 2013-06-04 +---------------- + +* Fix compatibility with Plone 4.3. + [davisagli] + 1.0b1 - 2009-04-17 ------------------ * Initial release - - diff --git a/plone/principalsource/source.py b/plone/principalsource/source.py index 81feb71..ee3728e 100644 --- a/plone/principalsource/source.py +++ b/plone/principalsource/source.py @@ -1,12 +1,14 @@ +from Products.CMFCore.utils import getToolByName +from plone.principalsource.term import PrincipalTerm +from z3c.formwidget.query.interfaces import IQuerySource from zope.interface import implements -from zope.app.component.hooks import getSite from zope.schema.interfaces import IContextSourceBinder -from z3c.formwidget.query.interfaces import IQuerySource +try: + from zope.component.hooks import getSite +except ImportError: + from zope.app.component.hooks import getSite -from plone.principalsource.term import PrincipalTerm - -from Products.CMFCore.utils import getToolByName class PrincipalSource(object): """A queriable source for users, groups or principals (users and/or @@ -197,6 +199,7 @@ class PrincipalSource(object): # Source binders + class PrincipalSourceBinder(object): """Bind the principal source with either users or groups """ @@ -211,6 +214,6 @@ class PrincipalSourceBinder(object): # Vocabulary factories (for named vocabularies) -PrincipalVocabularyFactory = PrincipalSourceBinder(users=True, groups=True) -UsersVocabularyFactory = PrincipalSourceBinder(users=True, groups=False) -GroupsVocabularyFactory = PrincipalSourceBinder(users=False, groups=True) \ No newline at end of file +PrincipalVocabularyFactory = PrincipalSourceBinder(users=True, groups=True) +UsersVocabularyFactory = PrincipalSourceBinder(users=True, groups=False) +GroupsVocabularyFactory = PrincipalSourceBinder(users=False, groups=True) diff --git a/setup.cfg b/setup.cfg index 8366168..3853736 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,6 +2,7 @@ template = plone [egg_info] -tag_build = dev -tag_svn_revision = true +tag_build = +tag_svn_revision = 0 +tag_date = 0 diff --git a/setup.py b/setup.py index 5da3eb5..e79f90a 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = '1.0b2' +version = '1.0' setup(name='plone.principalsource', version=version, @@ -10,10 +10,10 @@ setup(name='plone.principalsource', open(os.path.join("docs", "HISTORY.txt")).read(), # Get more strings from http://www.python.org/pypi?%3Aaction=list_classifiers classifiers=[ - "Framework :: Plone", - "Programming Language :: Python", - "Topic :: Software Development :: Libraries :: Python Modules", - ], + "Framework :: Plone", + "Programming Language :: Python", + "Topic :: Software Development :: Libraries :: Python Modules", + ], keywords='plone user group principal source', author='Martin Aspeli', author_email='optilude@gmail.com',