3 files changed, 74 insertions, 5 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index bd6c7f2..552ce18 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -715,6 +715,7 @@ class StreamHandler(Handler):
     to a stream. Note that this class does not close the stream, as
     sys.stdout or sys.stderr may be used.
     """
+
     def __init__(self, strm=None):
         """
         Initialize the handler.
@@ -739,10 +740,11 @@ class StreamHandler(Handler):
         Emit a record.
 
         If a formatter is specified, it is used to format the record.
-        The record is then written to the stream with a trailing newline
-        [N.B. this may be removed depending on feedback]. If exception
-        information is present, it is formatted using
-        traceback.print_exception and appended to the stream.
+        The record is then written to the stream with a trailing newline.  If
+        exception information is present, it is formatted using
+        traceback.print_exception and appended to the stream.  If the stream
+        has an 'encoding' attribute, it is used to encode the message before
+        output to the stream.
         """
         try:
             msg = self.format(record)
@@ -751,7 +753,10 @@ class StreamHandler(Handler):
                 self.stream.write(fs % msg)
             else:
                 try:
-                    self.stream.write(fs % msg)
+                    if hasattr(self.stream, 'encoding'):
+                        self.stream.write(fs % msg.encode(self.stream.encoding))
+                    else:
+                        self.stream.write(fs % msg)
                 except UnicodeError:
                     self.stream.write(fs % msg.encode("UTF-8"))
             self.flush()
diff --git a/Lib/test/crashers/iter.py b/Lib/test/crashers/iter.py
new file mode 100644
index 0000000..081dcbc
--- /dev/null
+++ b/Lib/test/crashers/iter.py
@@ -0,0 +1,53 @@
+# Calls to PyIter_Next, or direct calls to tp_iternext, on an object
+# which might no longer be an iterable because its 'next' method was
+# removed.  These are all variants of Issue3720.
+
+"""
+Run this script with an argument between 1 and <N> to test for
+different crashes.
+"""
+N = 8
+
+import sys
+
+class Foo(object):
+    def __iter__(self):
+        return self
+    def next(self):
+        del Foo.next
+        return (1, 2)
+
+def case1():
+    list(enumerate(Foo()))
+
+def case2():
+    x, y = Foo()
+
+def case3():
+    filter(None, Foo())
+
+def case4():
+    map(None, Foo(), Foo())
+
+def case5():
+    max(Foo())
+
+def case6():
+    sum(Foo(), ())
+
+def case7():
+    dict(Foo())
+
+def case8():
+    sys.stdout.writelines(Foo())
+
+# etc...
+
+
+if __name__ == '__main__':
+    if len(sys.argv) < 2:
+        print __doc__.replace('<N>', str(N))
+    else:
+        n = int(sys.argv[1])
+        func = globals()['case%d' % n]
+        func()
diff --git a/Lib/test/test_fileio.py b/Lib/test/test_fileio.py
index a676bc2..0404a19 100644
--- a/Lib/test/test_fileio.py
+++ b/Lib/test/test_fileio.py
@@ -100,6 +100,17 @@ class AutoFileTests(unittest.TestCase):
             # should raise on closed file
             self.assertRaises(ValueError, method)
 
+    def testOpendir(self):
+        # Issue 3703: opening a directory should fill the errno
+        # Windows always returns "[Errno 13]: Permission denied
+        # Unix calls dircheck() and returns "[Errno 21]: Is a directory"
+        try:
+            _fileio._FileIO('.', 'r')
+        except IOError as e:
+            self.assertNotEqual(e.errno, 0)
+        else:
+            self.fail("Should have raised IOError")
+
 
 class OtherFileTests(unittest.TestCase):