--- documentViewer/documentViewer.py	2010/06/17 18:34:36	1.72
+++ documentViewer/documentViewer.py	2010/06/18 14:23:20	1.75
@@ -7,7 +7,7 @@ from AccessControl import getSecurityMan
 from Globals import package_home
 
 from Ft.Xml import EMPTY_NAMESPACE, Parse
-from Ft.Xml.Domlette import PrettyPrint, Print
+import Ft.Xml.Domlette
 import os.path
 import sys
 import urllib
@@ -43,7 +43,7 @@ def getTextFromNode(nodename):
 def serializeNode(node, encoding='utf-8'):
     """returns a string containing node as XML"""
     buf = cStringIO.StringIO()
-    Print(node, stream=buf, encoding=encoding)
+    Ft.Xml.Domlette.Print(node, stream=buf, encoding=encoding)
     s = buf.getvalue()
     buf.close()
     return s
@@ -266,7 +266,7 @@ class documentViewer(Folder):
         ret=""
         if mk is None:
             return ""
-        if type(mk) is not ListType:
+        if not isinstance(mk, list):
             mk=[mk]
         for m in mk:
             ret+="mk=%s"%m
@@ -305,7 +305,8 @@ class documentViewer(Folder):
                 params["url"] = getParentDir(params["url"])
                 
         # quote values and assemble into query string
-        ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
+        #ps = "&".join(["%s=%s"%(k,urllib.quote(v)) for (k, v) in params.items()])
+        ps = urllib.urlencode(params)
         url=self.REQUEST['URL1']+"?"+ps
         return url