Author: jmorliaguet
Date: Mon Jun 5 16:11:00 2006
New Revision: 3315
Modified:
cpsskins/branches/paris-sprint-2006/setup/io/README.txt
cpsskins/branches/paris-sprint-2006/setup/manager.py
Log:
- test fix, we let 'chooseName' choose the preset's name
Modified: cpsskins/branches/paris-sprint-2006/setup/io/README.txt
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/io/README.txt (original)
+++ cpsskins/branches/paris-sprint-2006/setup/io/README.txt Mon Jun 5
16:11:00 2006
@@ -87,7 +87,7 @@
>>> print toXML(preset, u'presets')
<?xml version="1.0" encoding="utf-8"?>
<presets>
- <preset custom="False" name="style1" title="Style 1" type="format-style">
+ <preset name="style1" title="Style 1" type="format-style">
<rule selector="h1">
<property name="color" value="red"/>
</rule>
Modified: cpsskins/branches/paris-sprint-2006/setup/manager.py
==============================================================================
--- cpsskins/branches/paris-sprint-2006/setup/manager.py (original)
+++ cpsskins/branches/paris-sprint-2006/setup/manager.py Mon Jun 5
16:11:00 2006
@@ -20,6 +20,7 @@
import logging
from zope.app.container.interfaces import INameChooser
+from zope.app.traversing.api import getName
from zope.interface import implements
from cpsskins.setup.interfaces import IIdentifiable, IType
@@ -47,7 +48,7 @@
"""
presets = getThemeManager(context).getPresets()
chooser = INameChooser(presets)
- name = name or chooser.chooseName(title, context)
+ preset_name = chooser.chooseName(name, context)
if context is None:
preset = GlobalPreset(name=name, title=title, resource=resource,
filename=filename)
@@ -57,9 +58,8 @@
uri = IIdentifiable(preset).getURI()
if uri in presets:
self.unregister(uri, context)
- presets[name] = preset
+ presets[preset_name] = preset
presets.registerUtility(preset, IPreset, uri)
-
return preset
def unregister(self, uri=u'', context=None):
@@ -73,7 +73,7 @@
if preset is None:
raise ValueError("No such preset: '%s'" % uri)
- del presets[uri]
+ del presets[getName(preset)]
presets.unregisterUtility(provided=IPreset, name=uri)
def lookup(self, uri=u'', context=None, default=None):
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
