Author: jmorliaguet
Date: Fri Apr 14 12:52:34 2006
New Revision: 2840
Modified:
cpsskins/branches/jmo-perspectives/standard/displays/area.py
cpsskins/branches/jmo-perspectives/standard/displays/box.py
cpsskins/branches/jmo-perspectives/standard/displays/boxgroup.py
cpsskins/branches/jmo-perspectives/standard/io/boxgroup.py
cpsskins/branches/jmo-perspectives/standard/io/page.py
cpsskins/branches/jmo-perspectives/standard/io/setting.py
cpsskins/branches/jmo-perspectives/standard/io/settings.py
cpsskins/branches/jmo-perspectives/standard/io/storage.py
cpsskins/branches/jmo-perspectives/standard/io/theme.py
Log:
- using super()
- unicode fixes
Modified: cpsskins/branches/jmo-perspectives/standard/displays/area.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/displays/area.py
(original)
+++ cpsskins/branches/jmo-perspectives/standard/displays/area.py Fri Apr
14 12:52:34 2006
@@ -37,7 +37,7 @@
implements(IArea)
def __init__(self, **kw):
- Display.__init__(self, **kw)
+ super(Area, self).__init__(**kw)
def __repr__(self):
return "Area()"
Modified: cpsskins/branches/jmo-perspectives/standard/displays/box.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/displays/box.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/displays/box.py Fri Apr 14
12:52:34 2006
@@ -37,7 +37,7 @@
implements(IBox)
def __init__(self, **kw):
- Display.__init__(self, **kw)
+ super(Box, self).__init__(**kw)
def __repr__(self):
return "Box()"
Modified: cpsskins/branches/jmo-perspectives/standard/displays/boxgroup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/displays/boxgroup.py
(original)
+++ cpsskins/branches/jmo-perspectives/standard/displays/boxgroup.py Fri Apr
14 12:52:34 2006
@@ -87,7 +87,7 @@
implements(IBoxGroup)
def __init__(self, **kw):
- Display.__init__(self, **kw)
+ super(BoxGroup, self).__init__(**kw)
self._order = PersistentList()
def __repr__(self):
Modified: cpsskins/branches/jmo-perspectives/standard/io/boxgroup.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/boxgroup.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/boxgroup.py Fri Apr 14
12:52:34 2006
@@ -42,7 +42,7 @@
context = self.context
for item in context:
exporter = getMultiAdapter((context[item], request), IDataExporter)
- xml += exporter().replace('<?xml version="1.0"?>', '')
+ xml += exporter().replace(u'<?xml version="1.0"?>', u'')
return {
'uri': IIdentifiable(self.context).getURI(),
@@ -62,6 +62,7 @@
storage = self.context
boxgroup = BoxGroup()
- storage.add(boxgroup)
+ # TODO: import content
+ storage.add(boxgroup)
return boxgroup
Modified: cpsskins/branches/jmo-perspectives/standard/io/page.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/page.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/page.py Fri Apr 14
12:52:34 2006
@@ -44,7 +44,7 @@
xml = u''
for node in context:
exporter = getMultiAdapter((context[node], request), IDataExporter)
- xml += exporter().replace('<?xml version="1.0"?>', '')
+ xml += exporter().replace(u'<?xml version="1.0"?>', u'')
return {
'uri': IIdentifiable(context).getURI(),
Modified: cpsskins/branches/jmo-perspectives/standard/io/setting.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/setting.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/setting.py Fri Apr 14
12:52:34 2006
@@ -47,7 +47,7 @@
# export the resource
exporter = getMultiAdapter((resource, request), IDataExporter)
# remove the xml header used in the resource
- resource_xml = exporter().replace('<?xml version="1.0"?>', '')
+ resource_xml = exporter().replace(u'<?xml version="1.0"?>', u'')
return {
'name': context.name,
Modified: cpsskins/branches/jmo-perspectives/standard/io/settings.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/settings.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/settings.py Fri Apr 14
12:52:34 2006
@@ -46,7 +46,7 @@
xml = u''
for name, setting in getUtilitiesFor(ISetting, context=context):
exporter = getMultiAdapter((setting, request), IDataExporter)
- xml += exporter().replace('<?xml version="1.0"?>', '')
+ xml += exporter().replace(u'<?xml version="1.0"?>', u'')
return settings_xml % {'content': xml}
Modified: cpsskins/branches/jmo-perspectives/standard/io/storage.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/storage.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/storage.py Fri Apr 14
12:52:34 2006
@@ -47,7 +47,7 @@
xml = u''
for item in storage:
exporter = getMultiAdapter((storage[item], request), IDataExporter)
- xml += exporter().replace('<?xml version="1.0"?>', '')
+ xml += exporter().replace(u'<?xml version="1.0"?>', u'')
return XML % {
'name': zapi.name(storage),
Modified: cpsskins/branches/jmo-perspectives/standard/io/theme.py
==============================================================================
--- cpsskins/branches/jmo-perspectives/standard/io/theme.py (original)
+++ cpsskins/branches/jmo-perspectives/standard/io/theme.py Fri Apr 14
12:52:34 2006
@@ -44,7 +44,7 @@
xml = u''
for page in context.getPages():
exporter = getMultiAdapter((page, request), IDataExporter)
- xml += exporter().replace('<?xml version="1.0"?>', '')
+ xml += exporter().replace(u'<?xml version="1.0"?>', u'')
return {
'uri': IIdentifiable(context).getURI(),
--
http://lists.nuxeo.com/mailman/listinfo/z3lab-checkins
