Changeset 6786

Timestamp:

Apr 14, 2009, 12:08:23 PM (16 years ago)

Author:

rwilson

Message:

Changes to handle not having an internet connection.

File:

• branches/numpy/anuga/utilities/system_tools.py (modified) (6 diffs)

branches/numpy/anuga/utilities/system_tools.py

@@ -314 +314 @@
     return map(string.rstrip, [''.join(x) for x in ll])
 
+################################################################################
 
 ##
@@ -354 +355 @@
 # @param auth Auth tuple (httpproxy, proxyuser, proxypass).
 # @param blocksize Read file in this block size.
-# @return 'auth' tuple for subsequent calls, if successful.
+# @return 'auth' tuple for subsequent calls, if successful, else False.
 # @note If 'auth' not supplied, will prompt user.
 # @note Will try using environment variable HTTP_PROXY for proxy server.
@@ -360 +361 @@
 # @note Will try using environment variable PROXY_PASSWORD for proxy password.
 def get_web_file(file_url, file_name, auth=None, blocksize=1024*1024):
-    '''Get a file from the web.
+    '''Get a file from the web (HTTP).
 
     file_url:  The URL of the file to get
@@ -380 +381 @@
         return None     # no proxy, no auth required
     except IOError, e:
-        if e[1] != 407:
-            raise       # raise error if *not* proxy auth error
+        if e[1] == 407:     # proxy error
+            pass
+        elif e[1][0] == 113:  # no route to host
+            print 'No route to host for %s' % file_url
+            return False    # return False
+        else:
+            print 'Unknown connection error to %s' % file_url
+            return False
 
     # We get here if there was a proxy error, get file through the proxy
@@ -401 +408 @@
     if httpproxy is None or proxyuser is None or proxypass is None:
         print '-'*80
-        print ('You need to supply proxy authentication information.  '
-               'Use environment variables\n'
-               'HTTP_PROXY, PROXY_USERNAME and PROXY_PASSWORD to bypass '
-               'entry here:')
+        print ('You need to supply proxy authentication information.')
         if httpproxy is None:
             httpproxy = raw_input('  proxy server: ')
@@ -425 +429 @@
     opener = urllib2.build_opener(proxy, authinfo, urllib2.HTTPHandler)
     urllib2.install_opener(opener)
-    webget = urllib2.urlopen(file_url)
+    try:
+        webget = urllib2.urlopen(file_url)
+    except urllib2.HTTPError, e:
+        print 'Proxy authentication failed'
+        return False
 
     # transfer file to local filesystem