From 93280e2059c01e16c51848720d8e4d52b2c3deee Mon Sep 17 00:00:00 2001 From: schneefux Date: Thu, 11 Sep 2014 06:48:13 +0100 Subject: Using Diagnostics internet connection check in boot.py and test.py --- boot/boot.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'boot') diff --git a/boot/boot.py b/boot/boot.py index 5291ea2..8697c91 100755 --- a/boot/boot.py +++ b/boot/boot.py @@ -35,16 +35,15 @@ import traceback lib_path = os.path.abspath('../client') sys.path.append(lib_path) +from diagnose import Diagnostics import speaker as speak speaker = speak.newSpeaker() def testConnection(): - try: - urllib2.urlopen("http://www.google.com").getcode() + if Diagnostics.check_network_connection(): print "CONNECTED TO INTERNET" - - except urllib2.URLError: + else: print "COULD NOT CONNECT TO NETWORK" speaker.say( "Warning: I was unable to connect to a network. Parts of the system may not work correctly, depending on your setup.") -- cgit v1.3.1