[Zope3-checkins] CVS: Zope3/src/zope/app/browser/content - fssync.py:1.24.6.1 image.py:1.5.8.1 sql.py:1.10.8.1

[Jim Fulton]

Update of /cvs-repository/Zope3/src/zope/app/browser/content
In directory cvs.zope.org:/tmp/cvs-serv20092/src/zope/app/browser/content

Modified Files:
      Tag: parentgeddon-branch
	fssync.py image.py sql.py 
Log Message:
Checking in work in progress on parentgeddon-branch so Fred can help
me to get the tests passing.  Specific log entries will be provided
when we merge this into the head.


=== Zope3/src/zope/app/browser/content/fssync.py 1.24 => 1.24.6.1 ===
--- Zope3/src/zope/app/browser/content/fssync.py:1.24	Sun Aug 17 02:05:41 2003
+++ Zope3/src/zope/app/browser/content/fssync.py	Mon Sep  8 14:21:24 2003
@@ -22,7 +22,7 @@
 
 from transaction import get_transaction
 
-from zope.publisher.browser import BrowserView
+from zope.app.publisher.browser import BrowserView
 from zope.app.traversing import getName, getParent, getRoot
 from zope.fssync.snarf import Snarfer, Unsnarfer
 from zope.app.fssync.syncer import toFS


=== Zope3/src/zope/app/browser/content/image.py 1.5 => 1.5.8.1 ===
--- Zope3/src/zope/app/browser/content/image.py:1.5	Wed Aug  6 10:41:41 2003
+++ Zope3/src/zope/app/browser/content/image.py	Mon Sep  8 14:21:24 2003
@@ -19,7 +19,7 @@
 from zope.app.size import byteDisplay
 from zope.app.event.objectevent import ObjectModifiedEvent
 from zope.app.event import publish
-from zope.publisher.browser import BrowserView
+from zope.app.publisher.browser import BrowserView
 
 class ImageData(BrowserView):
 


=== Zope3/src/zope/app/browser/content/sql.py 1.10 => 1.10.8.1 ===
--- Zope3/src/zope/app/browser/content/sql.py:1.10	Wed Aug  6 10:41:41 2003
+++ Zope3/src/zope/app/browser/content/sql.py	Mon Sep  8 14:21:24 2003
@@ -17,7 +17,6 @@
 """
 from zope.app.interfaces.content.sql import ISQLScript
 from zope.app.interfaces.rdb import DatabaseException
-from zope.context import ContextMethod
 
 class SQLScriptTest:
     """Test the SQL inside the SQL Script"""
@@ -44,8 +43,6 @@
         except (DatabaseException, AttributeError, Exception), error:
             self.error = error
             return []
-
-    getTestResults = ContextMethod(getTestResults)
 
     def getFormattedError(self):
         error = str(self.error)