[Zope-Checkins] CVS: Zope/lib/python/OFS - Image.py:1.145.2.5.2.4
Chris McDonough
chrism at plope.com
Sun Mar 28 01:35:29 EST 2004
Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv14272
Modified Files:
Tag: chrism-publishfile-branch
Image.py
Log Message:
Reduce differences for CVS merge.
=== Zope/lib/python/OFS/Image.py 1.145.2.5.2.3 => 1.145.2.5.2.4 ===
--- Zope/lib/python/OFS/Image.py:1.145.2.5.2.3 Sun Mar 28 01:12:01 2004
+++ Zope/lib/python/OFS/Image.py Sun Mar 28 01:35:28 2004
@@ -31,11 +31,9 @@
from mimetools import choose_boundary
from ZPublisher import HTTPRangeSupport
from ZPublisher.HTTPRequest import FileUpload
+from ZPublisher.Iterators import filestream_iterator
from zExceptions import Redirect
from cgi import escape
-from ZPublisher.Iterators import filestream_iterator
-import stat
-import os
StringType=type('')
manage_addFileForm=DTMLFile('dtml/imageAdd', globals(),Kind='File',kind='file')
More information about the Zope-Checkins
mailing list