[pypy-svn] pypy fast-forward: Merge heads.

arigo commits-noreply at bitbucket.org
Sun Jan 16 16:50:38 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: fast-forward
Changeset: r40725:3d0acae8d7eb
Date: 2011-01-16 16:50 +0100
http://bitbucket.org/pypy/pypy/changeset/3d0acae8d7eb/

Log:	Merge heads.

diff --git a/lib-python/modified-2.7.0/test/test_asyncore.py b/lib-python/modified-2.7.0/test/test_asyncore.py
--- a/lib-python/modified-2.7.0/test/test_asyncore.py
+++ b/lib-python/modified-2.7.0/test/test_asyncore.py
@@ -130,7 +130,7 @@
             (select.POLLERR, 'closed'),
             (select.POLLHUP, 'closed'),
             (select.POLLNVAL, 'closed'),
-        )
+            )
 
         class testobj:
             def __init__(self):
@@ -398,10 +398,10 @@
 class FileWrapperTest(unittest.TestCase):
     def setUp(self):
         self.d = "It's not dead, it's sleeping!"
-        # Modified from CPython. Fixed in CPython 
-        # release27-maint, revision 88046. (2.7.2)
-        with file(TESTFN, 'w') as f:
-            f.write(self.d)
+        # Fixed in CPython 2.7.2 (release27-maint branch
+        # revision 88046.)
+        with file(TESTFN, 'w') as h:
+            h.write(self.d)
 
     def tearDown(self):
         unlink(TESTFN)
@@ -701,7 +701,7 @@
             s.create_socket(socket.AF_INET, socket.SOCK_STREAM)
             s.set_reuse_addr()
             self.assertTrue(s.socket.getsockopt(socket.SOL_SOCKET,
-                                                socket.SO_REUSEADDR))
+                                                 socket.SO_REUSEADDR))
         finally:
             sock.close()
 
@@ -721,4 +721,4 @@
     run_unittest(*tests)
 
 if __name__ == "__main__":
-    test_main()
\ No newline at end of file
+    test_main()


More information about the Pypy-commit mailing list