[Checkins] SVN: zope.preference/trunk/ fixed imports
Michael Howitz
mh at gocept.com
Fri Jun 11 13:51:09 EDT 2010
Log message for revision 113366:
fixed imports
Changed:
U zope.preference/trunk/buildout.cfg
U zope.preference/trunk/src/zope/preference/README.txt
U zope.preference/trunk/src/zope/preference/__init__.py
U zope.preference/trunk/src/zope/preference/default.py
U zope.preference/trunk/src/zope/preference/metaconfigure.py
U zope.preference/trunk/src/zope/preference/preference.py
U zope.preference/trunk/src/zope/preference/tests.py
-=-
Modified: zope.preference/trunk/buildout.cfg
===================================================================
--- zope.preference/trunk/buildout.cfg 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/buildout.cfg 2010-06-11 17:51:08 UTC (rev 113366)
@@ -4,7 +4,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = zope.app.preference [test]
+eggs = zope.preference [test]
[coverage]
recipe = zc.recipe.egg
Modified: zope.preference/trunk/src/zope/preference/README.txt
===================================================================
--- zope.preference/trunk/src/zope/preference/README.txt 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/README.txt 2010-06-11 17:51:08 UTC (rev 113366)
@@ -6,7 +6,7 @@
lot of custom coding and constantly changing preferences makes it hard to
maintain the data and UI. The `preference` package
- >>> from zope.app.preference import preference
+ >>> from zope.preference import preference
eases this pain by providing a generic user preferences framework that uses
schemas to categorize and describe the preferences.
@@ -68,7 +68,7 @@
>>> settings.__id__
'ZMISettings'
>>> settings.__schema__
- <InterfaceClass zope.app.preference.README.IZMIUserSettings>
+ <InterfaceClass zope.preference.README.IZMIUserSettings>
>>> settings.__title__
u'ZMI User Settings'
@@ -138,7 +138,7 @@
>>> settings.skin = 'MySkin'
Traceback (most recent call last):
...
- ConstraintNotSatisfied: MySkin
+ ConstraintNotSatisfied: MySkin
Preference Group Trees
@@ -179,7 +179,7 @@
... but not before we register the groups as utilities:
- >>> from zope.app.preference import interfaces
+ >>> from zope.preference import interfaces
>>> from zope.app.testing import ztapi
>>> ztapi.provideUtility(interfaces.IPreferenceGroup, settings,
@@ -190,10 +190,10 @@
If we now try to lookup the sub-group again, we should be successful:
>>> settings.Folder #doctest:+ELLIPSIS
- <zope.app.preference.preference.PreferenceGroup object at ...>
+ <zope.preference.preference.PreferenceGroup object at ...>
>>> settings['Folder'] #doctest:+ELLIPSIS
- <zope.app.preference.preference.PreferenceGroup object at ...>
+ <zope.preference.preference.PreferenceGroup object at ...>
While the registry of the preference groups is flat, the careful naming of the
ids allows us to have a tree of preferences. Note that this pattern is very
@@ -218,19 +218,19 @@
It sometimes desirable to define default settings on a site-by-site basis,
instead of just using the default value from the schema. The preferences
package provides a module
-
- >>> from zope.app.preference import default
+ >>> from zope.preference import default
+
that implements a default preferences provider that can be added as a unnamed
utility for each site. So the first step is to create a site:
-
+
>>> root = setup.buildSampleFolderTree()
>>> rsm = setup.createSiteManager(root, True)
Now we can register the default preference provider with the root site:
- >>> provider = setup.addUtility(rsm, '',
- ... interfaces.IDefaultPreferenceProvider,
+ >>> provider = setup.addUtility(rsm, '',
+ ... interfaces.IDefaultPreferenceProvider,
... default.DefaultPreferenceProvider())
So before we set an explicit default value for a preference, the schema field
@@ -245,7 +245,7 @@
>>> defaultFolder.sortedBy = 'size'
then the default of the setting changes:
-
+
>>> settings.Folder.sortedBy
'size'
@@ -257,8 +257,8 @@
and add a default provider there,
- >>> provider1 = setup.addUtility(sm1, '',
- ... interfaces.IDefaultPreferenceProvider,
+ >>> provider1 = setup.addUtility(sm1, '',
+ ... interfaces.IDefaultPreferenceProvider,
... default.DefaultPreferenceProvider())
then we still get the root's default values, because we have not defined any
@@ -317,8 +317,8 @@
ZCML instead. First, we need to register the directives:
>>> from zope.configuration import xmlconfig
- >>> import zope.app.preference
- >>> context = xmlconfig.file('meta.zcml', zope.app.preference)
+ >>> import zope.preference
+ >>> context = xmlconfig.file('meta.zcml', zope.preference)
Then the system sets up a root preference group:
@@ -329,7 +329,7 @@
...
... <preferenceGroup
... id=""
- ... title="User Preferences"
+ ... title="User Preferences"
... />
...
... </configure>''', context)
@@ -352,14 +352,14 @@
... <preferenceGroup
... id="ZMISettings2"
... title="ZMI Settings NG"
- ... schema="zope.app.preference.README.IZMIUserSettings"
+ ... schema="zope.preference.README.IZMIUserSettings"
... category="true"
... />
...
... </configure>''', context)
>>> prefs.ZMISettings2 #doctest:+ELLIPSIS
- <zope.app.preference.preference.PreferenceGroup object at ...>
+ <zope.preference.preference.PreferenceGroup object at ...>
>>> prefs.ZMISettings2.__title__
u'ZMI Settings NG'
@@ -379,13 +379,13 @@
... <preferenceGroup
... id="ZMISettings2.Folder"
... title="Folder Settings"
- ... schema="zope.app.preference.README.IFolderSettings"
+ ... schema="zope.preference.README.IFolderSettings"
... />
...
... </configure>''', context)
>>> prefs.ZMISettings2 #doctest:+ELLIPSIS
- <zope.app.preference.preference.PreferenceGroup object at ...>
+ <zope.preference.preference.PreferenceGroup object at ...>
>>> prefs.ZMISettings2.Folder.__title__
u'Folder Settings'
@@ -401,7 +401,7 @@
If a site is set, getting the user preferences is very simple:
- >>> from zope.app.preference import UserPreferences
+ >>> from zope.preference import UserPreferences
>>> prefs2 = UserPreferences()
>>> prefs2.ZMISettings.Folder.sortedBy
'size'
@@ -409,7 +409,7 @@
This function is also commonly registered as an adapter,
>>> from zope.location.interfaces import ILocation
- >>> ztapi.provideAdapter(ILocation, interfaces.IUserPreferences,
+ >>> ztapi.provideAdapter(ILocation, interfaces.IUserPreferences,
... UserPreferences)
so that you can adapt any location to the user preferences:
@@ -451,7 +451,7 @@
available. They are actually available publicly (`CheckerPublic`), but that
is not a problem, since the available values are looked up specifically for
the current user. And why should a user not have full access to his/her
-preferences?
+preferences?
Let's create a checker using the function that the security machinery is
actually using:
Modified: zope.preference/trunk/src/zope/preference/__init__.py
===================================================================
--- zope.preference/trunk/src/zope/preference/__init__.py 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/__init__.py 2010-06-11 17:51:08 UTC (rev 113366)
@@ -1,3 +1,3 @@
# Make a package
-from zope.app.preference.preference import UserPreferences
+from zope.preference.preference import UserPreferences
Modified: zope.preference/trunk/src/zope/preference/default.py
===================================================================
--- zope.preference/trunk/src/zope/preference/default.py 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/default.py 2010-06-11 17:51:08 UTC (rev 113366)
@@ -27,7 +27,7 @@
import zope.app.component
from zope.app.container.contained import Contained
-from zope.app.preference import preference, interfaces
+from zope.preference import preference, interfaces
class DefaultPreferenceProvider(persistent.Persistent, Contained):
zope.interface.implements(interfaces.IDefaultPreferenceProvider)
@@ -69,7 +69,7 @@
if group is default:
return default
return DefaultPreferenceGroup(group, self.provider).__bind__(self)
-
+
def items(self):
return [
(id, DefaultPreferenceGroup(group, self.provider).__bind__(self))
@@ -94,7 +94,7 @@
self.provider, interfaces.IDefaultPreferenceProvider)
# No more providers found, so return the schema's default
- if nextProvider is None:
+ if nextProvider is None:
return self.__schema__[key].default
nextGroup = nextProvider.getDefaultPreferenceGroup(self.__id__)
Modified: zope.preference/trunk/src/zope/preference/metaconfigure.py
===================================================================
--- zope.preference/trunk/src/zope/preference/metaconfigure.py 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/metaconfigure.py 2010-06-11 17:51:08 UTC (rev 113366)
@@ -11,17 +11,17 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""This module handles the 'apidoc' namespace directives.
+"""This module handles the 'preference' namespace directives.
$Id$
"""
__docformat__ = 'restructuredtext'
+
from zope.component.zcml import utility
+from zope.preference.interfaces import IPreferenceGroup
+from zope.preference.preference import PreferenceGroup
-from zope.app.preference.interfaces import IPreferenceGroup
-from zope.app.preference.preference import PreferenceGroup
-
def preferenceGroup(_context, id=None, schema=None,
title=u'', description=u'', category=False):
if id is None:
Modified: zope.preference/trunk/src/zope/preference/preference.py
===================================================================
--- zope.preference/trunk/src/zope/preference/preference.py 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/preference.py 2010-06-11 17:51:08 UTC (rev 113366)
@@ -31,9 +31,9 @@
from zope.container.contained import Contained
from zope.container.interfaces import IReadContainer
-from zope.app.preference.interfaces import IPreferenceGroup
-from zope.app.preference.interfaces import IPreferenceCategory
-from zope.app.preference.interfaces import IDefaultPreferenceProvider
+from zope.preference.interfaces import IPreferenceGroup
+from zope.preference.interfaces import IPreferenceCategory
+from zope.preference.interfaces import IDefaultPreferenceProvider
pref_key = 'zope.app.user.UserPreferences'
Modified: zope.preference/trunk/src/zope/preference/tests.py
===================================================================
--- zope.preference/trunk/src/zope/preference/tests.py 2010-06-11 17:41:02 UTC (rev 113365)
+++ zope.preference/trunk/src/zope/preference/tests.py 2010-06-11 17:51:08 UTC (rev 113366)
@@ -15,35 +15,22 @@
$Id$
"""
-from zope.app.testing import setup, functional
+from zope.app.testing import setup
from zope.component import testing
import doctest
-import unittest
-import zope.app.preference.testing
def setUp(test):
testing.setUp(test)
- setup.setUpTestAsModule(test, 'zope.app.preference.README')
+ setup.setUpTestAsModule(test, 'zope.preference.README')
-def ftest_setUp(test):
- setup.setUpTestAsModule(test, 'zope.app.preference.zmi')
-
-
def tearDown(test):
testing.tearDown(test)
setup.tearDownTestAsModule(test)
def test_suite():
- browser_tests = functional.FunctionalDocFileSuite(
- 'zmi.txt', setUp=ftest_setUp, tearDown=tearDown)
- browser_tests.layer = zope.app.preference.testing.PreferencesLayer
-
- return unittest.TestSuite((
- doctest.DocFileSuite('README.txt',
- setUp=setUp, tearDown=tearDown,
- optionflags=doctest.NORMALIZE_WHITESPACE),
- browser_tests,
- ))
+ return doctest.DocFileSuite('README.txt',
+ setUp=setUp, tearDown=tearDown,
+ optionflags=doctest.NORMALIZE_WHITESPACE)
More information about the checkins
mailing list