From e22813067e4f62629a9c24947c29a55861fb05f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Charles-Fran=C3=A7ois=20Natali?= <neologix@free.fr>
Date: Thu, 14 Jul 2011 19:53:38 +0200
Subject: [PATCH 1/2] Issue #12502: asyncore: fix polling loop with AF_UNIX
 sockets.

---
 Lib/asyncore.py | 6 ++++--
 Misc/NEWS       | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Lib/asyncore.py b/Lib/asyncore.py
index 00464a9427b..3f0d2d365ca 100644
--- a/Lib/asyncore.py
+++ b/Lib/asyncore.py
@@ -130,7 +130,8 @@ def poll(timeout=0.0, map=None):
             is_w = obj.writable()
             if is_r:
                 r.append(fd)
-            if is_w:
+            # accepting sockets should not be writable
+            if is_w and not obj.accepting:
                 w.append(fd)
             if is_r or is_w:
                 e.append(fd)
@@ -177,7 +178,8 @@ def poll2(timeout=0.0, map=None):
             flags = 0
             if obj.readable():
                 flags |= select.POLLIN | select.POLLPRI
-            if obj.writable():
+            # accepting sockets should not be writable
+            if obj.writable() and not obj.accepting:
                 flags |= select.POLLOUT
             if flags:
                 # Only check for exceptions if object was either readable
diff --git a/Misc/NEWS b/Misc/NEWS
index 1e98768a764..63d5c24e6ef 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -22,6 +22,8 @@ What's New in Python 3.1.4?
 Library
 -------
 
+- Issue #12502: asyncore: fix polling loop with AF_UNIX sockets.
+
 - Issue #12009: Fixed regression in netrc file comment handling.
 
 Extension Modules

From 8cdc40e3b0622ea4eeb8b2c9b0e6796be685d16d Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 15 Jul 2011 21:15:07 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Issue=20#11603:=20Fix=20a=20crash=20when=20?=
 =?UTF-8?q?=5F=5Fstr=5F=5F=20is=20rebound=20as=20=5F=5Frepr=5F=5F.=20Patch?=
 =?UTF-8?q?=20by=20Andreas=20St=C3=BChrk.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lib/test/test_descr.py | 8 ++++++++
 Misc/NEWS              | 3 +++
 Objects/typeobject.c   | 2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index c74e2327769..0ce85f0b697 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -4252,6 +4252,14 @@ order (MRO) for bases """
         with self.assertRaises(TypeError):
             str.__add__(fake_str, "abc")
 
+    def test_repr_as_str(self):
+        # Issue #11603: crash or infinite loop when rebinding __str__ as
+        # __repr__.
+        class Foo:
+            pass
+        Foo.__repr__ = Foo.__str__
+        foo = Foo()
+        str(foo)
 
 class DictProxyTests(unittest.TestCase):
     def setUp(self):
diff --git a/Misc/NEWS b/Misc/NEWS
index 63d5c24e6ef..b14e169a883 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -13,6 +13,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11603: Fix a crash when __str__ is rebound as __repr__.  Patch by
+  Andreas Stührk.
+
 
 What's New in Python 3.1.4?
 ===========================
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 5c20e0da110..70971f38eef 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -2821,7 +2821,7 @@ object_str(PyObject *self)
     unaryfunc f;
 
     f = Py_TYPE(self)->tp_repr;
-    if (f == NULL)
+    if (f == NULL || f == object_str)
         f = object_repr;
     return f(self);
 }