--- documentViewer/documentViewer.py	2010/06/16 18:35:59	1.69.2.5
+++ documentViewer/documentViewer.py	2010/06/16 18:46:29	1.69.2.9
@@ -13,9 +13,8 @@ import urllib
 import urllib2
 import logging
 import math
-
 import urlparse 
-from types import *
+import cStringIO
 
 def logger(txt,method,txt2):
     """logging"""
@@ -72,7 +71,7 @@ def getHttpData(url, data=None, num_trie
             if sys.version_info < (2, 6):
                 # set timeout on socket -- ugly :-(
                 import socket
-                socket.setdefaulttimeout(timeout)
+                socket.setdefaulttimeout(float(timeout))
                 response = urllib2.urlopen(url)
             else:
                 response = urllib2.urlopen(url,timeout=float(timeout))