Changeset 6638

Timestamp:

Mar 27, 2009, 10:35:17 AM (16 years ago)

Author:

rwilson

Message:

Minor changes related to automatic patong validation.

Location:

anuga_core/source/anuga/utilities

Files:

• log.py (modified) (1 diff)
• system_tools.py (modified) (4 diffs)

anuga_core/source/anuga/utilities/log.py

@@ -85 +85 @@
 
         # tell the world how we are set up
-        start_msg = ("Logfile is '%s' with logging level of %s, "
+        start_msg = ("\nLogfile is '%s' with logging level of %s, "
                      "console logging level is %s"
                      % (log_filename,

anuga_core/source/anuga/utilities/system_tools.py

@@ -294 +294 @@
 # @param file_url URL of the file to fetch.
 # @param file_name Path to file to create in the filesystem.
+# @param auth Auth tuple (httpproxy, proxyuser, proxypass).
 # @param blocksize Read file in this block size.
-# @param auth Auth tuple (httpproxy, proxyuser, proxypass).
 # @return 'auth' tuple for subsequent calls, if successful.
 # @note If 'auth' not supplied, will prompt user.
@@ -301 +301 @@
 # @note Will try using environment variable PROXY_USERNAME for proxy username.
 # @note Will try using environment variable PROXY_PASSWORD for proxy password.
-def get_web_file(file_url, file_name, blocksize=1024*1024, auth=None):
+def get_web_file(file_url, file_name, auth=None, blocksize=1024*1024):
     '''Get a file from the web.'''
 
@@ -309 +309 @@
         return None     # no proxy, no auth required
     except IOError, e:
-        print str(e)
         if e[1] != 407:
             raise       # raise error if *not* proxy auth error
@@ -345 +344 @@
 
     # open 'net file
-    proxy = urllib2.ProxyHandler({'http': 'http://'+proxyuser+':'+proxypass
-                                               +'@'+httpproxy})
+    proxy = urllib2.ProxyHandler({'http': 'http://' + proxyuser
+                                              + ':' + proxypass
+                                              + '@' + httpproxy})
     authinfo = urllib2.HTTPBasicAuthHandler()
     opener = urllib2.build_opener(proxy, authinfo, urllib2.HTTPHandler)