Skip to content
This repository has been archived by the owner on Dec 18, 2020. It is now read-only.

Commit

Permalink
Use current pacakges.
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Groszer committed Aug 30, 2010
1 parent c3e78e9 commit 7d05d12
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CHANGES
0.3.2 (unreleased)
------------------

- Nothing changed yet.
- Use current pacakges.


0.3.1 (2010-08-30)
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ def read(*rnames):
install_requires = [
'setuptools',
'ZODB3',
'zope.authentication',
'zope.component',
'zope.i18nmessageid',
'zope.interface',
Expand All @@ -73,9 +74,7 @@ def read(*rnames):
'zope.traversing',
'zope.viewlet',
'zope.app.pagetemplate>=3.6.0',
'zope.app.authentication>=3.7.0',
'zope.app.component',
'zope.app.security',
'zope.pluggableauth',
],
zip_safe = False,
)
4 changes: 2 additions & 2 deletions src/z3c/sampledata/ftests.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from zope.lifecycleevent import ObjectCreatedEvent

from zope.app.testing import functional
from zope.app.authentication.authentication import PluggableAuthentication
from zope.pluggableauth import PluggableAuthentication
from zope.app.authentication.principalfolder import PrincipalFolder
from zope.app.authentication.interfaces import IAuthenticatorPlugin
from zope.app.security.interfaces import IAuthentication
from zope.authentication.interfaces import IAuthentication


functional.defineLayer('TestLayer', 'ftesting.zcml')
Expand Down
6 changes: 3 additions & 3 deletions src/z3c/sampledata/generator/pau.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
import zope.lifecycleevent
from zope.interface import implements

from zope.app.authentication.authentication import PluggableAuthentication
from zope.app.security.interfaces import IAuthentication
from zope.app.authentication.interfaces import IAuthenticatorPlugin
from zope.pluggableauth import PluggableAuthentication
from zope.authentication.interfaces import IAuthentication
from zope.pluggableauth.interfaces import IAuthenticatorPlugin
from zope.app.authentication.principalfolder import PrincipalFolder

from z3c.sampledata.interfaces import ISampleDataPlugin
Expand Down
3 changes: 1 addition & 2 deletions src/z3c/sampledata/generator/pau.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Now that everything is set up we can generate the intids utility-
>>> 'pau' in site.getSiteManager()['default']
True
>>> from zope import component
>>> from zope.app.security.interfaces import IAuthentication
>>> from zope.authentication.interfaces import IAuthentication
>>> component.getUtility(IAuthentication)
<zope.pluggableauth.authentication.PluggableAuthentication object at ...>

2 changes: 1 addition & 1 deletion src/z3c/sampledata/generator/principals.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
import zope.lifecycleevent
from zope.interface import implements
from zope.app.authentication import principalfolder
from zope.app.component import hooks
from zope.site import hooks

from z3c.sampledata.interfaces import ISampleDataPlugin

Expand Down

0 comments on commit 7d05d12

Please sign in to comment.