diff MoinMoin/action/AttachFile.py @ 102:a54cebaab73e

move make / parse query string functions to wikiutil, make unicode-safe imported from: moin--main--1.5--patch-104
author Thomas Waldmann <tw@waldmann-edv.de>
date Sat, 15 Oct 2005 18:03:12 +0000
parents 2202f548cbb0
children 8b3945dbbb4d
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Sat Oct 15 16:56:39 2005 +0000
+++ b/MoinMoin/action/AttachFile.py	Sat Oct 15 18:03:12 2005 +0000
@@ -28,7 +28,7 @@
 import os, mimetypes, time, zipfile
 from MoinMoin import config, user, util, wikiutil, packages
 from MoinMoin.Page import Page
-from MoinMoin.util import MoinMoinNoFooter, filesys, web
+from MoinMoin.util import MoinMoinNoFooter, filesys
 
 action_name = __name__.split('.')[-1]
 
@@ -304,7 +304,7 @@
     drawpath = getAttachUrl(pagename, basename + '.draw', request, escaped=1)
     pngpath = getAttachUrl(pagename, basename + '.png', request, escaped=1)
     querystr = {'action': 'AttachFile', 'ts': now}
-    querystr = wikiutil.escape(web.makeQueryString(querystr))
+    querystr = wikiutil.escape(wikiutil.makeQueryString(querystr))
     pagelink = '%s/%s?%s' % (request.getScriptname(), wikiutil.quoteWikinameURL(pagename), querystr)
     helplink = Page(request, "HelpOnActions/AttachFile").url(request)
     savelink = Page(request, pagename).url(request) # XXX include target filename param here for twisted