From 265b0be2551f04bdec88800b5a172dba5b0c790a Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Wed, 04 Dec 2013 00:52:38 +0000
Subject: better error checking in geturl

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py
index 7f4138c..69cf2e2 100644
--- a/TurtleArt/talogo.py
+++ b/TurtleArt/talogo.py
@@ -1071,11 +1071,16 @@ class LogoCode:
         except urllib2.HTTPError, e:
             debug_output("Couldn't open %s: %s" % (url, e),
                          self.tw.running_sugar)
-            raise logoerror(url)
+            raise logoerror(url + ' (404)')
         except urllib2.URLError, e:
-            debug_output("Couldn't open %s: %s" % (url, e),
-                         self.tw.running_sugar)
-            raise logoerror('#noconnection')
+            if hasattr(e, 'reason'):
+                debug_output("Couldn't reach server: %s" % (e),
+                             self.tw.running_sugar)
+                raise logoerror('#noconnection')
+            else:  # elif hasattr(e, 'code'):
+                debug_output("Couldn't open %s: %s" % (url, e),
+                             self.tw.running_sugar)
+                raise logoerror(url + ' (404)')
 
         if req.info().getheader("Content-Type")[0:5] == "image":
             # it can't be deleted immediately, or else we won't ever access it
--
cgit v0.9.1