[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Only test reStructuredText functionality under Zope 2.13 and before.
Hanno Schlichting
hannosch at hannosch.eu
Sun Jul 3 09:57:21 EDT 2011
Log message for revision 122079:
Only test reStructuredText functionality under Zope 2.13 and before.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
U Products.CMFDefault/trunk/Products/CMFDefault/Document.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py
U Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2011-07-03 13:55:58 UTC (rev 122078)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt 2011-07-03 13:57:21 UTC (rev 122079)
@@ -4,6 +4,8 @@
2.3.0-alpha (unreleased)
------------------------
+- Only test reStructuredText functionality under Zope 2.13 and before.
+
- Document: Improved 'manage_FTPget' method.
HTML responses can now be rendered by a view.
Modified: Products.CMFDefault/trunk/Products/CMFDefault/Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2011-07-03 13:55:58 UTC (rev 122078)
+++ Products.CMFDefault/trunk/Products/CMFDefault/Document.py 2011-07-03 13:57:21 UTC (rev 122079)
@@ -72,7 +72,8 @@
_size = 0
_stx_level = 1 # Structured text level
- _rest_level = getConfiguration().rest_header_level # comes from zope.conf
+ # comes from zope.conf
+ _rest_level = getattr(getConfiguration(), 'rest_header_level', 3)
rest_available = REST_AVAILABLE
_last_safety_belt_editor = ''
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py 2011-07-03 13:55:58 UTC (rev 122078)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_Document.py 2011-07-03 13:57:21 UTC (rev 122079)
@@ -279,6 +279,9 @@
self.failUnless( d.CookedBody().find('<h2') >= 0 )
def test_ReStructuredText(self):
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if not REST_AVAILABLE:
+ return
self.REQUEST['BODY'] = BASIC_ReST
d = self._makeOne('foo')
d.PUT(self.REQUEST, self.RESPONSE)
@@ -314,6 +317,9 @@
] )
def test_EditReStructuredTextWithHTML(self):
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if not REST_AVAILABLE:
+ return
d = self._makeOne('foo')
d.edit(text_format='restructured-text', text=ReST_WITH_HTML)
@@ -321,6 +327,9 @@
self.assertEqual(d.get_size(), len(ReST_WITH_HTML))
def test_ReST_Levels(self):
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if not REST_AVAILABLE:
+ return
d = self._makeOne('foo')
d.edit(text_format='restructured-text', text=BASIC_ReST)
d.CookedBody(rest_level=0, setlevel=True)
@@ -402,6 +411,9 @@
self.failUnless( 'STX' in d.Subject() )
def test_ReST_NoHeaders( self ):
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if not REST_AVAILABLE:
+ return
self.REQUEST['BODY'] = ReST_NO_HEADERS
d = self._makeOne('foo')
d.editMetadata( title="Plain ReST"
@@ -435,6 +447,9 @@
self.assertEqual( d.EditableBody(), STX_NO_HEADERS_BUT_COLON )
def test_ReST_NoHeaders_but_colon( self ):
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if not REST_AVAILABLE:
+ return
d = self._makeOne('foo')
d.editMetadata( title="Plain ReST"
, description="Look, Ma, no headers!"
@@ -469,11 +484,13 @@
d.setFormat( d.Format() )
self.assertEqual( d.text_format, 'structured-text' )
- d.setFormat('restructured-text')
- self.assertEqual( d.text_format, 'restructured-text' )
- self.assertEqual( d.Format(), 'text/plain' )
- d.setFormat( d.Format() )
- self.assertEqual( d.text_format, 'restructured-text' )
+ from Products.CMFDefault.Document import REST_AVAILABLE
+ if REST_AVAILABLE:
+ d.setFormat('restructured-text')
+ self.assertEqual( d.text_format, 'restructured-text' )
+ self.assertEqual( d.Format(), 'text/plain' )
+ d.setFormat( d.Format() )
+ self.assertEqual( d.text_format, 'restructured-text' )
d.setFormat('html')
self.assertEqual( d.text_format, 'html' )
Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py 2011-07-03 13:55:58 UTC (rev 122078)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_NewsItem.py 2011-07-03 13:57:21 UTC (rev 122079)
@@ -20,7 +20,6 @@
from Products.CMFCore.testing import ConformsToContent
from Products.CMFCore.tests.base.content import BASIC_HTML
-from Products.CMFCore.tests.base.content import BASIC_ReST
from Products.CMFCore.tests.base.content import BASIC_STRUCTUREDTEXT
from Products.CMFCore.tests.base.content import DOCTYPE
from Products.CMFCore.tests.base.content import ENTITY_IN_TITLE
@@ -39,7 +38,6 @@
def test_interfaces(self):
from Products.CMFDefault.interfaces import IDocument
- from Products.CMFDefault.interfaces import IMutableDocument
from Products.CMFDefault.interfaces import IMutableNewsItem
from Products.CMFDefault.interfaces import INewsItem
@@ -67,15 +65,6 @@
self.assertEqual( d.text_format, 'structured-text' )
self.assertEqual( d.text, '' )
- def test_Empty_ReST(self):
- d = self._makeOne('foo', text_format='restructured-text')
-
- self.assertEqual( d.Title(), '' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'restructured-text' )
- self.assertEqual( d.text, '' )
-
def test_Init_with_stx( self ):
d = self._makeOne('foo', text_format='structured-text',
title='Foodoc')
@@ -86,16 +75,6 @@
self.assertEqual( d.text_format, 'structured-text' )
self.assertEqual( d.text, '' )
- def test_Init_with_ReST( self ):
- d = self._makeOne('foo', text_format='restructured-text',
- title='Foodoc')
-
- self.assertEqual( d.Title(), 'Foodoc' )
- self.assertEqual( d.Description(), '' )
- self.assertEqual( d.Format(), 'text/plain' )
- self.assertEqual( d.text_format, 'restructured-text' )
- self.assertEqual( d.text, '' )
-
def test_default_format( self ):
d = self._makeOne('foo', text='')
More information about the checkins
mailing list