[Zope3-checkins] CVS: Zope3/src/zope/app/rotterdam - ftests.py:1.2
xmlobject.py:1.4
Stephan Richter
srichter at cosmos.phy.tufts.edu
Wed Mar 17 13:00:00 EST 2004
Update of /cvs-repository/Zope3/src/zope/app/rotterdam
In directory cvs.zope.org:/tmp/cvs-serv19275/src/zope/app/rotterdam
Modified Files:
ftests.py xmlobject.py
Log Message:
Removed TABs from source code. Resolves issue 186.
=== Zope3/src/zope/app/rotterdam/ftests.py 1.1 => 1.2 ===
--- Zope3/src/zope/app/rotterdam/ftests.py:1.1 Tue Mar 2 12:11:30 2004
+++ Zope3/src/zope/app/rotterdam/ftests.py Wed Mar 17 12:59:30 2004
@@ -42,28 +42,28 @@
'id':u'somesite'})
self.assertEqual(response.getStatus(), 302)
- #add a site manager This will break when site adding is fixed
- # see above for examples to fix by filling out a form
- # when further action is required to make a site
+ #add a site manager This will break when site adding is fixed
+ # see above for examples to fix by filling out a form
+ # when further action is required to make a site
response = self.publish("/First/somesite/addServiceManager.html",
- basic='mgr:mgrpw')
+ basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 302)
# /First/FirstsFolder/@@singleBranchTree.xml
# contains those 4 elements above
# /@@children.xml
- # contains First Second and Third
-
+ # contains First Second and Third
+
response = self.publish(
- "/First/somesite/++etc++site/@@singleBranchTree.xml",
- basic='mgr:mgrpw')
+ "/First/somesite/++etc++site/@@singleBranchTree.xml",
+ basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 200)
- tree = minidom.parseString(response.getBody())
+ tree = minidom.parseString(response.getBody())
response = self.publish("/@@children.xml", basic='mgr:mgrpw')
self.assertEqual(response.getStatus(), 200)
- tree = minidom.parseString(response.getBody())
+ tree = minidom.parseString(response.getBody())
response = self.publish("/First/+/action.html", basic='mgr:mgrpw',
form={'type_name':u'Folder',
=== Zope3/src/zope/app/rotterdam/xmlobject.py 1.3 => 1.4 ===
--- Zope3/src/zope/app/rotterdam/xmlobject.py:1.3 Fri Mar 5 17:09:16 2004
+++ Zope3/src/zope/app/rotterdam/xmlobject.py Wed Mar 17 12:59:30 2004
@@ -33,13 +33,13 @@
def xmlEscape(format, *args):
quotedArgs = [ quoteattr(str(arg)) for arg in args ]
return format%tuple(quotedArgs)
-
+
def xmlEscapeWithCData(format, *args):
cData = args[-1]
quotedArgs = [ quoteattr(str(arg)) for arg in args[:-1] ]
quotedArgsWithCData = quotedArgs + [cData]
return format%tuple(quotedArgsWithCData)
-
+
class ReadContainerXmlObjectView(BrowserView):
"""Provide a xml interface for dynamic navigation tree in UI"""
@@ -90,7 +90,7 @@
setNoCacheHeaders(self.request.response)
res = (u'<?xml version="1.0" ?><children> %s </children>'
% self.children_utility(container))
- return res
+ return res
def singleBranchTree(self, root=''):
"""Return an XML document with the siblings and parents of an object.
@@ -120,7 +120,7 @@
subItem = traverse(item, name, None)
if IReadContainer.providedBy(subItem):
iconUrl = self.getIconUrl(subItem)
- # the test below seems to be browken with the ++etc++site case
+ # the test below seems to be browken with the ++etc++site case
if subItem == oldItem:
subItems.append(xmlEscapeWithCData(
'<collection name=%s length=%s '
@@ -140,13 +140,13 @@
# do not forget root folder
iconUrl = self.getIconUrl(oldItem)
result = (xmlEscapeWithCData('<collection name="" length=%s '
- 'icon_url=%s isroot="">%s</collection>',
+ 'icon_url=%s isroot="">%s</collection>',
len(oldItem), iconUrl, result))
self.request.response.setHeader('Content-Type', 'text/xml')
setNoCacheHeaders(self.request.response)
res= u'<?xml version="1.0" ?><children> %s </children>' % result
- return res
+ return res
class XmlObjectView(BrowserView):
"""Provide a xml interface for dynamic navigation tree in UI"""
More information about the Zope3-Checkins
mailing list