[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/ - some cleanup (svn properties, headers, whitespace)
Yvo Schubbe
y.2010 at wcm-solutions.de
Fri Jul 2 03:20:10 EDT 2010
Log message for revision 114091:
- some cleanup (svn properties, headers, whitespace)
Changed:
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/__init__.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_contents.pt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/interfaces.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/newsitem.py
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/source.pt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/__init__.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder_utest.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
_U Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_favorite.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_file.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_image.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_link.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_metadata.py
UU Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/__init__.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/__init__.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/__init__.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,6 +11,4 @@
#
##############################################################################
"""CMFDefault content views.
-
-$Id$
"""
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/__init__.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml 2010-07-02 07:20:10 UTC (rev 114091)
@@ -68,7 +68,7 @@
class=".document.SourceView"
template="source.pt"
permission="cmf.ModifyPortalContent"
- />
+ />
<browser:page
for="Products.CMFDefault.interfaces.IMutableDocument"
@@ -155,6 +155,5 @@
template="image.pt"
permission="zope2.View"
/>
-
</configure>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/configure.zcml
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for documents.
-
-$Id$
"""
from zope.component import adapts
@@ -156,8 +154,8 @@
class SourceView(ViewBase):
"""View the document source"""
-
+
@decode
@memoize
def editable_body(self):
- return self.context.EditableBody()
\ No newline at end of file
+ return self.context.EditableBody()
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/document.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for favorites.
-
-$Id$
"""
import urlparse
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/favorite.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for files.
-
-$Id$
"""
from zope.component import adapts
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/file.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for folders.
-
-$Id$
"""
import urllib
@@ -44,7 +42,7 @@
"""Vocabulary for the pulldown for moving objects up and down.
"""
length = len(context.contentIds())
- deltas = [SimpleTerm(i, str(i), str(i))
+ deltas = [SimpleTerm(i, str(i), str(i))
for i in range(1, min(5, length)) + range(5, length, 5)]
return SimpleVocabulary(deltas)
@@ -56,11 +54,11 @@
_BATCH_SIZE = 25
hidden_fields = form.FormFields(IHidden)
prefix = ''
-
+
@memoize
def setUpWidgets(self, ignore_request=False):
- self.hidden_widgets = form.setUpWidgets(self.hidden_fields, self.prefix,
- self.context, self.request,
+ self.hidden_widgets = form.setUpWidgets(self.hidden_fields, self.prefix,
+ self.context, self.request,
ignore_request=ignore_request)
@memoize
@@ -172,8 +170,8 @@
def page_range(self):
"""Create a range of up to ten pages around the current page"""
pages = [(idx + 1, b_start) for idx, b_start in enumerate(
- range(0,
- self._getBatchObj().sequence_length,
+ range(0,
+ self._getBatchObj().sequence_length,
self._BATCH_SIZE)
)
]
@@ -182,7 +180,7 @@
_page_range = []
for page, b_start in pages[range_start:range_stop]:
_page_range.append(
- {'number':page,
+ {'number':page,
'url':self._getNavigationURL(b_start)
}
)
@@ -213,15 +211,15 @@
@memoize
@decode
def summary_match(self):
- return self.request.form.get('SearchableText')
+ return self.request.form.get('SearchableText')
class ContentsView(BatchViewBase, _EditFormMixin, PageForm):
"""Folder contents view"""
-
+
template = ViewPageTemplateFile('folder_contents.pt')
prefix = 'form'
-
+
object_actions = form.Actions(
form.Action(
name='rename',
@@ -253,7 +251,7 @@
validator='validate_items',
success='handle_delete')
)
-
+
delta_actions = form.Actions(
form.Action(
name='up',
@@ -268,7 +266,7 @@
validator='validate_items',
success='handle_down')
)
-
+
absolute_actions = form.Actions(
form.Action(
name='top',
@@ -292,16 +290,16 @@
validator='validate_items',
success='handle_top')
)
-
+
actions = object_actions + delta_actions + absolute_actions + sort_actions
errors = ()
-
+
def __init__(self, *args, **kw):
super(ContentsView, self).__init__(*args, **kw)
self.form_fields = form.FormFields()
self.delta_field = form.FormFields(IDeltaItem)
- self.contents = self.context.contentValues()
-
+ self.contents = self.context.contentValues()
+
def content_fields(self):
"""Create content field objects only for batched items"""
for item in self._getBatchObj():
@@ -328,7 +326,7 @@
'url': ''}
else:
return {}
-
+
def setUpWidgets(self, ignore_request=False):
"""Create widgets for the folder contents."""
super(ContentsView, self).setUpWidgets(ignore_request)
@@ -342,7 +340,7 @@
self.widgets += form.setUpWidgets(
self.delta_field, self.prefix, self.context,
self.request, ignore_request=ignore_request)
-
+
@memoize
def _get_sorting(self):
"""How should the contents be sorted"""
@@ -352,11 +350,11 @@
return (key, data.get('reverse', 0))
else:
return self.context.getDefaultSorting()
-
+
@memoize
def _is_default_sorting(self,):
return self._get_sorting() == self.context.getDefaultSorting()
-
+
@memoize
def column_headings(self):
key, reverse = self._get_sorting()
@@ -378,7 +376,7 @@
query = urllib.urlencode(paras)
column['url'] = '%s?%s' % (self._getViewURL(), query)
return tuple(columns)
-
+
@memoize
def _get_items(self):
key, reverse = self._get_sorting()
@@ -406,7 +404,7 @@
field['type'] = item.Type() or None
fields.append(field.copy())
return fields
-
+
def _get_ids(self, data):
"""Identify objects that have been selected"""
ids = [k[:-7] for k, v in data.items()
@@ -418,15 +416,15 @@
def has_subobjects(self, action=None):
"""Return false if the user cannot rename subobjects"""
return bool(self.contents)
-
+
@memoize
def check_clipboard_data(self, action=None):
"""Any data in the clipboard"""
return bool(self.context.cb_dataValid())
-
+
@memoize
def can_sort_be_changed(self, action=None):
- """Returns true if the default sort key may be changed
+ """Returns true if the default sort key may be changed
may be sorted for display"""
items_move_allowed = self._checkPermission(ManageProperties)
return items_move_allowed and not \
@@ -436,19 +434,19 @@
def is_orderable(self, action=None):
"""Returns true if the displayed contents can be
reorded."""
- (key, reverse) = self._get_sorting()
+ (key, reverse) = self._get_sorting()
return key == 'position' and len(self.contents) > 1
-
+
#Action validators
def validate_items(self, action=None, data=None):
- """Check whether any items have been selected for
+ """Check whether any items have been selected for
the requested action."""
super(ContentsView, self).validate(action, data)
if data is None or data == {}:
return [_(u"Please select one or more items first.")]
else:
return []
-
+
#Action handlers
def handle_rename(self, action, data):
"""Redirect to rename view passing the ids of objects to be renamed"""
@@ -458,7 +456,7 @@
keys = ",".join(self._getHiddenVars().keys() + ['ids'])
# keys = 'b_start, ids, key, reverse'
return self._setRedirect('portal_types', 'object/rename_items', keys)
-
+
def handle_cut(self, action, data):
"""Cut the selected objects and put them in the clipboard"""
ids = self._get_ids(data)
@@ -472,7 +470,7 @@
self.status = _(u'CopyError: Cut failed.')
except zExceptions_Unauthorized:
self.status = _(u'Unauthorized: Cut failed.')
- return self._setRedirect('portal_types', 'object/new_contents')
+ return self._setRedirect('portal_types', 'object/new_contents')
def handle_copy(self, action, data):
"""Copy the selected objects to the clipboard"""
@@ -486,7 +484,7 @@
except CopyError:
self.status = _(u'CopyError: Copy failed.')
return self._setRedirect('portal_types', 'object/new_contents')
-
+
def handle_paste(self, action, data):
"""Paste the objects from the clipboard into the folder"""
try:
@@ -497,7 +495,7 @@
self.status = _(u'Items pasted.')
except CopyError, error:
self.status = _(u'CopyError: Paste failed.')
- self.request['RESPONSE'].expireCookie('__cp',
+ self.request['RESPONSE'].expireCookie('__cp',
path='%s' % (self.request['BASEPATH1'] or "/"))
except zExceptions_Unauthorized:
@@ -513,7 +511,7 @@
else:
self.status = _(u'Items deleted.')
return self._setRedirect('portal_types', 'object/new_contents')
-
+
def handle_up(self, action, data):
"""Move the selected objects up the selected number of places"""
ids = self._get_ids(data)
@@ -551,7 +549,7 @@
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self._setRedirect('portal_types', 'object/new_contents')
-
+
def handle_top(self, action, data):
"""Move the selected objects to the top of the page"""
ids = self._get_ids(data)
@@ -587,7 +585,7 @@
except ValueError:
self.status = _(u'ValueError: Move failed.')
return self._setRedirect('portal_types', 'object/new_contents')
-
+
def handle_sort_order(self, action, data):
"""Set the sort options for the folder."""
key = data['position']
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_contents.pt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_contents.pt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/folder_contents.pt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -21,10 +21,10 @@
tal:replace="structure error" /></li>
</ul>
-<p class="status"
+<p class="status"
tal:condition="exists: request/portal_status_message"
tal:content="request/portal_status_message"></p>
-
+
<form class="form" action="." method="post" enctype="multipart/form-data"
tal:attributes="action request/ACTUAL_URL">
<tal:block repeat="widget view/hidden_widgets"
@@ -37,7 +37,7 @@
tal:attributes="href column/url"
>Column Title</a></th>
</tr>
- <tr tal:repeat="item view/listBatchItems"
+ <tr tal:repeat="item view/listBatchItems"
tal:attributes="class python: (repeat['item'].even() and 'row-hilite') or ''">
<td tal:content="structure item/select">Checkbox</td>
<td><a href="" tal:attributes="href item/url"
@@ -51,11 +51,11 @@
</tr>
</table>
<div class="buttons">
- <tal:loop tal:repeat="action view/object_actions"
+ <tal:loop tal:repeat="action view/object_actions"
tal:replace="structure action/render" />
</div>
<div class="buttons">
- <tal:loop tal:repeat="action view/delta_actions"
+ <tal:loop tal:repeat="action view/delta_actions"
tal:replace="structure action/render" />
<div tal:condition="view/is_orderable"
tal:define="widget python:view.widgets.get('delta');
@@ -66,11 +66,11 @@
</div>
</div>
<div class="buttons">
- <tal:loop tal:repeat="action view/absolute_actions"
+ <tal:loop tal:repeat="action view/absolute_actions"
tal:replace="structure action/render" />
</div>
<div class="buttons">
- <tal:loop tal:repeat="action view/sort_actions"
+ <tal:loop tal:repeat="action view/sort_actions"
tal:replace="structure action/render" />
</div>
</form>
@@ -79,4 +79,4 @@
</metal:slot>
</body>
-</html>
\ No newline at end of file
+</html>
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -1,11 +1,22 @@
+##############################################################################
+#
+# Copyright (c) 2010 Zope Foundation and Contributors.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Browser views for images.
"""
-Image view
-$Id$
-"""
from Products.CMFDefault.browser.utils import (
ViewBase, memoize, decode)
+
class ImageView(ViewBase):
"""View for IImage.
@@ -14,4 +25,4 @@
@memoize
@decode
def image(self):
- return self.context.tag()
\ No newline at end of file
+ return self.context.tag()
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/image.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/interfaces.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/interfaces.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/interfaces.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser view interfaces.
-
-$Id$
"""
from zope.interface import Interface
@@ -24,10 +22,10 @@
class IFolderItem(Interface):
"""Schema for folderish objects contents."""
-
+
select = Bool(
required=False)
-
+
name = TextLine(
title=u"Name",
required=False,
@@ -35,7 +33,7 @@
class IDeltaItem(Interface):
- """Schema for delta"""
+ """Schema for delta"""
delta = Choice(
title=u"By",
description=u"Move an object up or down the chosen number of places.",
@@ -43,19 +41,19 @@
vocabulary=u'cmf.contents delta vocabulary',
default=1)
-
+
class IHidden(Interface):
"""Schema for hidden items"""
-
+
b_start = Int(
title=u"Batch start",
required=False,
default=0)
-
+
sort_key = TextLine(
title=u"Sort key",
required=False)
-
+
reverse = Int(
title=u"Reverse sort order",
required=False)
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/interfaces.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for links.
-
-$Id$
"""
import urlparse
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/link.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for metadata.
-
-$Id$
"""
from Acquisition import aq_self
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/metadata.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/newsitem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/newsitem.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/newsitem.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
"""Browser views for news items.
-
-$Id$
"""
from zope.component import adapts
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/newsitem.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/source.pt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/__init__.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -55,4 +55,3 @@
>>> browser.getControl('[[zope][Add]]').click()
>>> '[[cmf_default][[[cmf_default][Document]] added.]]' in browser.contents
True
-
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/btreefolder.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -81,8 +81,8 @@
>>> app.site.myDocument.wl_isLocked()
0
>>> browser.open('http://localhoste/site/myDocument/@@edit.html')
-
- >>> browser.getControl(name='form.text_format').value == ['structured-text']
+
+ >>> browser.getControl(name='form.text_format').value == ['structured-text']
True
>>> browser.getControl('[[cmf_default][Body]]').value = '*spam and eggs*'
>>> browser.getControl('[[cmf_default][Change]]').click()
@@ -102,4 +102,3 @@
True
>>> '<meta name="Description" content="" />' in browser.contents
True
-
\ No newline at end of file
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/document.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/favorite.txt
___________________________________________________________________
Deleted: svn:mime-type
- text/plain
Deleted: svn:mergeinfo
-
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/file.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -64,4 +64,4 @@
True
>>> browser.open('http://localhost/site/@@edit.html?form.sort_key=position&form.reverse=1')
>>> 'name="form.reverse" type="hidden" value="1"' in browser.contents
- True
\ No newline at end of file
+ True
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder.txt
___________________________________________________________________
Deleted: svn:mime-type
- text/plain
Deleted: svn:mergeinfo
-
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/folder_utest.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -40,6 +40,6 @@
>>> browser.open('http://localhost/site/myImage.gif/@@view.html')
>>> 'IMAGE DESCRIPTION' in browser.contents
True
-
+
>>> '<img src="http://localhost/site/myImage.gif" alt="" title="IMAGE TITLE" />' in browser.contents
- True
\ No newline at end of file
+ True
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/image.txt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/link.txt
___________________________________________________________________
Deleted: svn:mime-type
- text/plain
Deleted: svn:mergeinfo
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt 2010-07-02 07:20:10 UTC (rev 114091)
@@ -3,7 +3,7 @@
Set up content and user.
- >>> from Products.CMFDefault.Document import Document
+ >>> from Products.CMFDefault.Document import Document
>>> id = app.site._setObject('myContent', Document('myContent'))
>>> app.site.myContent._setPortalTypeName('Document')
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/metadata.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.folder with CMFBTreeFolder
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_btreefolder.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.document
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_document.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_favorite.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_favorite.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_favorite.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.favorite
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_favorite.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_file.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_file.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_file.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.file
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_file.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.folder
-
-$Id$
"""
import unittest
@@ -51,7 +49,7 @@
folder = PortalFolder('test_folder')
self.folder = site._setObject('test_folder', folder)
self.uf = self.site._setObject('acl_users', DummyUserFolder())
-
+
def _make_one(self, name="DummyItem"):
content = DummyContent(name)
content.portal_type = "Dummy Content"
@@ -65,49 +63,49 @@
self._make_one(content_id)
def site_login(self):
- newSecurityManager(None,
+ newSecurityManager(None,
UnrestrictedUser('god', '', ['Manager'], ''))
-
+
def test_view(self):
view = ContentsView(self.folder, TestRequest())
self.failUnless(IBrowserPublisher.providedBy(view))
-
+
def test_up_info(self):
view = ContentsView(self.folder, TestRequest())
self.assertEquals({'url':u'', 'id':u'Root', 'icon':u''},
view.up_info())
-
+
def test_list_batch_items(self):
view = ContentsView(self.folder, TestRequest())
self.assertEquals(view.listBatchItems(), [])
-
+
def test_is_orderable(self):
view = ContentsView(self.folder, TestRequest())
self.failIf(view.is_orderable())
-
+
def test_sort_can_be_changed(self):
view = ContentsView(self.folder, TestRequest())
self.failIf(view.can_sort_be_changed())
-
+
def test_empty_has_subobjects(self):
view = ContentsView(self.folder, TestRequest())
self.failIf(view.has_subobjects())
-
+
def test_has_subobjects(self):
self._make_one()
view = ContentsView(self.folder, TestRequest())
self.failUnless(view.has_subobjects())
-
+
def test_check_clipboard_data(self):
view = ContentsView(self.folder, TestRequest())
self.failIf(view.check_clipboard_data())
-
+
def test_validate_items(self):
"""Cannot validate forms without widgets"""
view = ContentsView(self.folder, TestRequest())
- self.assertRaises(AttributeError,
+ self.assertRaises(AttributeError,
view.validate_items, "", {'foo':'bar'})
-
+
def test_get_ids(self):
view = ContentsView(self.folder, TestRequest())
self.assertEquals(
@@ -129,7 +127,7 @@
setUp=setupVocabulary,
tearDown=clearVocabulary,
)
-
+
ftest_suite.layer = FunctionalLayer
def test_suite():
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_folder.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_image.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_image.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_image.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.image
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_image.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_link.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_link.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_link.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.link
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_link.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_metadata.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_metadata.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_metadata.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Test Products.CMFDefault.browser.metadata
-
-$Id$
"""
import unittest
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/test_metadata.py
___________________________________________________________________
Deleted: svn:keywords
- Id
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py 2010-07-02 07:17:28 UTC (rev 114090)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py 2010-07-02 07:20:10 UTC (rev 114091)
@@ -11,8 +11,6 @@
#
##############################################################################
""" Shared utility functions for browser view tests
-
-$Id$
"""
try:
Property changes on: Products.CMFDefault/trunk/Products/CMFDefault/browser/content/tests/utils.py
___________________________________________________________________
Deleted: svn:keywords
- Id
More information about the checkins
mailing list