Null byte replacement fix

jgraham · jgraham · commit 56aaba86d06e · 2007-03-07T22:49:49.000Z
--HG--
extra : convert_revision : svn%3Aacbfec75-9323-0410-a652-858a13e371e0/trunk%40516
diff --git a/src/inputstream.py b/src/inputstream.py
@@ -51,7 +51,7 @@ def __init__(self, source, encoding=None):
 
         # Normalize new ipythonlines and null characters
         uString = re.sub('\r\n?', '\n', uString)
-        uString = re.sub('\x00', '\xFFFD', uString)
+        uString = re.sub('\x00', u'\uFFFD', uString)
 
         # Convert the unicode string into a list to be used as the data stream
         self.dataStream = uString
diff --git a/utils/spider.py b/utils/spider.py
@@ -81,7 +81,7 @@ def updateURLs(self, tree):
                 except KeyError:
                     pass
         
-        #Remove all non-http URLs and add a sutiable base URL where that is
+        #Remove all non-http URLs and a dd a sutiable base URL where that is
         #missing
         newUrls = set()
         for url in urls:
@@ -99,7 +99,7 @@ def updateURLs(self, tree):
             try:
                 resp, content = self.http.request(url, "HEAD")
                 responseHeaders[url] = resp
-            except AttributeError:
+            except AttributeError, KeyError:
                 #Don't know why this happens
                 pass
             
