From fee85e6b3e43be00200a11c4d57f592500bade72 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Sat, 26 Nov 2005 16:51:02 +0000 Subject: backport: bug #1365984, urllib and data: URLs^^ --- Lib/urllib.py | 7 +++++-- Misc/NEWS | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Lib/urllib.py b/Lib/urllib.py index f00d02f..f700d71 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -556,7 +556,7 @@ class URLopener: msg = '\n'.join(msg) f = StringIO(msg) headers = mimetools.Message(f, 0) - f.fileno = None # needed for addinfourl + #f.fileno = None # needed for addinfourl return addinfourl(f, headers, url) @@ -813,7 +813,10 @@ class addbase: self.read = self.fp.read self.readline = self.fp.readline if hasattr(self.fp, "readlines"): self.readlines = self.fp.readlines - if hasattr(self.fp, "fileno"): self.fileno = self.fp.fileno + if hasattr(self.fp, "fileno"): + self.fileno = self.fp.fileno + else: + self.fileno = lambda: None if hasattr(self.fp, "__iter__"): self.__iter__ = self.fp.__iter__ if hasattr(self.fp, "next"): diff --git a/Misc/NEWS b/Misc/NEWS index 0c8b4e1..a630755 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -47,6 +47,8 @@ Extension Modules Library ------- +- Bug #1365984: urllib now opens "data:" URLs again. + - Patch #1314396: Prevent threading.Thread.join() from blocking if a previous call caused an exception to be raised (e.g., calling join() with an illegal argument). -- cgit v0.12