[Zope3-checkins] CVS: Zope3/src/zope/app/content - zpt.py:1.1.2.5
Fred L. Drake, Jr.
fred@zope.com
Tue, 24 Dec 2002 09:38:54 -0500
Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv21314
Modified Files:
Tag: NameGeddon-branch
zpt.py
Log Message:
minor cleanups
=== Zope3/src/zope/app/content/zpt.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/content/zpt.py:1.1.2.4 Tue Dec 24 07:51:00 2002
+++ Zope3/src/zope/app/content/zpt.py Tue Dec 24 09:38:54 2002
@@ -17,23 +17,26 @@
import re
-from zope.interface import Interface, Attribute
-import zope.schema
from persistence import Persistent
+import zope.schema
+
+from zope.interface import Interface, Attribute
from zope.proxy.context import ContextMethod
from zope.proxy.context import getWrapperContainer
from zope.security.proxy import ProxyFactory
from zope.pagetemplate.pagetemplate import PageTemplate
from zope.app.pagetemplate.engine import AppPT
+from zope.app.interfaces.index.text.interfaces import ISearchableText
+
class IZPTPage(Interface):
"""ZPT Pages are a persistent implementation of Page Templates.
Note: I introduced some new methods whose functionality is
actually already covered by some other methods but I
- want to start inforcing a common coding standard.
+ want to start enforcing a common coding standard.
"""
def setSource(text, content_type='text/html'):
@@ -106,9 +109,6 @@
"""Source of the Page Template.""")
-# Adapter for ISearchableText
-from zope.app.interfaces.index.text.interfaces import ISearchableText
-
class SearchableText:
__used_for__ = IZPTPage
@@ -125,11 +125,9 @@
# text was already Unicode, which happens, but unclear how it
# gets converted to Unicode since the ZPTPage stores UTF-8 as
# an 8-bit string.
-
-
+
if self.page.content_type.startswith('text/html'):
tag = re.compile(r"<[^>]+>")
text = tag.sub('', text)
-
-
+
return [text]