Mailman 3 November 2010 - Python-checkins

r86078 - in python/branches/release31-maint: Lib/multiprocessing/__init__.py Lib/test/test_multiprocessing.py
by brian.curtin Nov. 1, 2010

Nov. 1, 2010

Author: brian.curtin Date: Mon Nov 1 06:12:34 2010 New Revision: 86078 Log: Merged revisions 86077 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86077 | brian.curtin | 2010-11-01 00:10:44 -0500 (Mon, 01 Nov 2010) | 3 lines Fix some ResourceErrors. Use a context manager for os.popen and explicitly close a socket. ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/multiprocessing/__init__.py python/branches/release31-maint/Lib/test/test_multiprocessing.py Modified: python/branches/release31-maint/Lib/multiprocessing/__init__.py ============================================================================== --- python/branches/release31-maint/Lib/multiprocessing/__init__.py (original) +++ python/branches/release31-maint/Lib/multiprocessing/__init__.py Mon Nov 1 06:12:34 2010 @@ -115,7 +115,8 @@ num = 0 elif 'bsd' in sys.platform or sys.platform == 'darwin': try: - num = int(os.popen('sysctl -n hw.ncpu').read()) + with os.popen('sysctl -n hw.ncpu') as p: + num = int(p.read()) except ValueError: num = 0 else: Modified: python/branches/release31-maint/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_multiprocessing.py (original) +++ python/branches/release31-maint/Lib/test/test_multiprocessing.py Mon Nov 1 06:12:34 2010 @@ -1225,7 +1225,11 @@ authkey = os.urandom(32) manager = QueueManager( address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) - addr = manager.get_server().address + srvr = manager.get_server() + addr = srvr.address + # Close the connection.Listener socket which gets opened as a part + # of manager.get_server(). It's not needed for the test. + srvr.listener.close() manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey))

1 0

r86077 - in python/branches/py3k/Lib: multiprocessing/__init__.py test/test_multiprocessing.py
by brian.curtin Nov. 1, 2010

Nov. 1, 2010

Author: brian.curtin Date: Mon Nov 1 06:10:44 2010 New Revision: 86077 Log: Fix some ResourceErrors. Use a context manager for os.popen and explicitly close a socket. Modified: python/branches/py3k/Lib/multiprocessing/__init__.py python/branches/py3k/Lib/test/test_multiprocessing.py Modified: python/branches/py3k/Lib/multiprocessing/__init__.py ============================================================================== --- python/branches/py3k/Lib/multiprocessing/__init__.py (original) +++ python/branches/py3k/Lib/multiprocessing/__init__.py Mon Nov 1 06:10:44 2010 @@ -115,7 +115,8 @@ num = 0 elif 'bsd' in sys.platform or sys.platform == 'darwin': try: - num = int(os.popen('sysctl -n hw.ncpu').read()) + with os.popen('sysctl -n hw.ncpu') as p: + num = int(p.read()) except ValueError: num = 0 else: Modified: python/branches/py3k/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/py3k/Lib/test/test_multiprocessing.py (original) +++ python/branches/py3k/Lib/test/test_multiprocessing.py Mon Nov 1 06:10:44 2010 @@ -1260,7 +1260,11 @@ authkey = os.urandom(32) manager = QueueManager( address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) - addr = manager.get_server().address + srvr = manager.get_server() + addr = srvr.address + # Close the connection.Listener socket which gets opened as a part + # of manager.get_server(). It's not needed for the test. + srvr.listener.close() manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey))

1 0

r86076 - in python/branches/release27-maint: configure configure.in
by benjamin.peterson Nov. 1, 2010

Nov. 1, 2010

Author: benjamin.peterson Date: Mon Nov 1 02:47:19 2010 New Revision: 86076 Log: Merged revisions 86075 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86075 | benjamin.peterson | 2010-10-31 20:44:30 -0500 (Sun, 31 Oct 2010) | 1 line fix output for getaddrinfo bug check #7059 ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/configure python/branches/release27-maint/configure.in Modified: python/branches/release27-maint/configure ============================================================================== --- python/branches/release27-maint/configure (original) +++ python/branches/release27-maint/configure Mon Nov 1 02:47:19 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 85556 . +# From configure.in Revision: 86043 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 2.7. # @@ -10799,6 +10799,9 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5 +$as_echo "$ac_cv_buggy_getaddrinfo" >&6; } + if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes then if test $ipv6 = yes @@ -10812,6 +10815,7 @@ $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h fi + for ac_func in getnameinfo do : ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" Modified: python/branches/release27-maint/configure.in ============================================================================== --- python/branches/release27-maint/configure.in (original) +++ python/branches/release27-maint/configure.in Mon Nov 1 02:47:19 2010 @@ -3109,6 +3109,8 @@ [ac_cv_buggy_getaddrinfo=yes])) fi +AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) + if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes then if test $ipv6 = yes @@ -3120,6 +3122,7 @@ else AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if you have the getaddrinfo function.]) fi + AC_CHECK_FUNCS(getnameinfo) # checks for structures

1 0

r86075 - in python/branches/py3k: configure configure.in
by benjamin.peterson Nov. 1, 2010

Nov. 1, 2010

Author: benjamin.peterson Date: Mon Nov 1 02:44:30 2010 New Revision: 86075 Log: fix output for getaddrinfo bug check #7059 Modified: python/branches/py3k/configure python/branches/py3k/configure.in Modified: python/branches/py3k/configure ============================================================================== --- python/branches/py3k/configure (original) +++ python/branches/py3k/configure Mon Nov 1 02:44:30 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 86042 . +# From configure.in Revision: 86045 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.2. # @@ -10562,6 +10562,9 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_buggy_getaddrinfo" >&5 +$as_echo "$ac_cv_buggy_getaddrinfo" >&6; } + if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes then if test $ipv6 = yes @@ -10575,6 +10578,7 @@ $as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h fi + for ac_func in getnameinfo do : ac_fn_c_check_func "$LINENO" "getnameinfo" "ac_cv_func_getnameinfo" Modified: python/branches/py3k/configure.in ============================================================================== --- python/branches/py3k/configure.in (original) +++ python/branches/py3k/configure.in Mon Nov 1 02:44:30 2010 @@ -2931,6 +2931,8 @@ [ac_cv_buggy_getaddrinfo=yes])) fi +AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) + if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes then if test $ipv6 = yes @@ -2942,6 +2944,7 @@ else AC_DEFINE(HAVE_GETADDRINFO, 1, [Define if you have the getaddrinfo function.]) fi + AC_CHECK_FUNCS(getnameinfo) # checks for structures

1 0