Mailman 3 January 2010 - Python-checkins

r77842 - in python/trunk: Doc/c-api/long.rst Include/longobject.h Misc/NEWS Modules/_testcapimodule.c Objects/longobject.c
by mark.dickinson Jan. 30, 2010

Jan. 30, 2010

Author: mark.dickinson Date: Sat Jan 30 11:08:33 2010 New Revision: 77842 Log: Issue #7767: Add new C-API function PyLong_AsLongLongAndOverflow, a long long variant of PyLong_AsLongAndOverflow. Patch by Case Van Horsen. Modified: python/trunk/Doc/c-api/long.rst python/trunk/Include/longobject.h python/trunk/Misc/NEWS python/trunk/Modules/_testcapimodule.c python/trunk/Objects/longobject.c Modified: python/trunk/Doc/c-api/long.rst ============================================================================== --- python/trunk/Doc/c-api/long.rst (original) +++ python/trunk/Doc/c-api/long.rst Sat Jan 30 11:08:33 2010 @@ -146,6 +146,19 @@ .. versionadded:: 2.7 +.. cfunction:: PY_LONG_LONG PyLong_AsLongLongAndOverflow(PyObject *pylong, int* overflow) + + Return a C :ctype:`long long` representation of the contents of + *pylong*. If *pylong* is greater than :const:`PY_LLONG_MAX` or less + than :const:`PY_LLONG_MIN`, set `*overflow` to ``1`` or ``-1``, + respectively, and return ``-1``; otherwise, set `*overflow` to + ``0``. If any other exception occurs (for example a TypeError or + MemoryError), then ``-1`` will be returned and ``*overflow`` will + be ``0``. + + .. versionadded:: 2.7 + + .. cfunction:: Py_ssize_t PyLong_AsSsize_t(PyObject *pylong) .. index:: Modified: python/trunk/Include/longobject.h ============================================================================== --- python/trunk/Include/longobject.h (original) +++ python/trunk/Include/longobject.h Sat Jan 30 11:08:33 2010 @@ -51,6 +51,7 @@ PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLong(PyObject *); PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLong(PyObject *); PyAPI_FUNC(unsigned PY_LONG_LONG) PyLong_AsUnsignedLongLongMask(PyObject *); +PyAPI_FUNC(PY_LONG_LONG) PyLong_AsLongLongAndOverflow(PyObject *, int *); #endif /* HAVE_LONG_LONG */ PyAPI_FUNC(PyObject *) PyLong_FromString(char *, char **, int); Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sat Jan 30 11:08:33 2010 @@ -254,6 +254,9 @@ C-API ----- +- Issue #7767: New function PyLong_AsLongLongAndOverflow added, + analogous to PyLong_AsLongAndOverflow. + - Issue #5080: The argument parsing functions PyArg_ParseTuple, PyArg_ParseTupleAndKeywords, PyArg_VaParse, PyArg_VaParseTupleAndKeywords and PyArg_Parse no longer accept float Modified: python/trunk/Modules/_testcapimodule.c ============================================================================== --- python/trunk/Modules/_testcapimodule.c (original) +++ python/trunk/Modules/_testcapimodule.c Sat Jan 30 11:08:33 2010 @@ -523,6 +523,171 @@ return Py_None; } +/* Test the PyLong_AsLongLongAndOverflow API. General conversion to + PY_LONG_LONG is tested by test_long_api_inner. This test will + concentrate on proper handling of overflow. +*/ + +static PyObject * +test_long_long_and_overflow(PyObject *self) +{ + PyObject *num, *one, *temp; + PY_LONG_LONG value; + int overflow; + + /* Test that overflow is set properly for a large value. */ + /* num is a number larger than PY_LLONG_MAX on a typical machine. */ + num = PyLong_FromString("FFFFFFFFFFFFFFFFFFFFFFFF", NULL, 16); + if (num == NULL) + return NULL; + overflow = 1234; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != -1) + return raiseTestError("test_long_long_and_overflow", + "return value was not set to -1"); + if (overflow != 1) + return raiseTestError("test_long_long_and_overflow", + "overflow was not set to 1"); + + /* Same again, with num = PY_LLONG_MAX + 1 */ + num = PyLong_FromLongLong(PY_LLONG_MAX); + if (num == NULL) + return NULL; + one = PyLong_FromLong(1L); + if (one == NULL) { + Py_DECREF(num); + return NULL; + } + temp = PyNumber_Add(num, one); + Py_DECREF(one); + Py_DECREF(num); + num = temp; + if (num == NULL) + return NULL; + overflow = 0; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != -1) + return raiseTestError("test_long_long_and_overflow", + "return value was not set to -1"); + if (overflow != 1) + return raiseTestError("test_long_long_and_overflow", + "overflow was not set to 1"); + + /* Test that overflow is set properly for a large negative value. */ + /* num is a number smaller than PY_LLONG_MIN on a typical platform */ + num = PyLong_FromString("-FFFFFFFFFFFFFFFFFFFFFFFF", NULL, 16); + if (num == NULL) + return NULL; + overflow = 1234; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != -1) + return raiseTestError("test_long_long_and_overflow", + "return value was not set to -1"); + if (overflow != -1) + return raiseTestError("test_long_long_and_overflow", + "overflow was not set to -1"); + + /* Same again, with num = PY_LLONG_MIN - 1 */ + num = PyLong_FromLongLong(PY_LLONG_MIN); + if (num == NULL) + return NULL; + one = PyLong_FromLong(1L); + if (one == NULL) { + Py_DECREF(num); + return NULL; + } + temp = PyNumber_Subtract(num, one); + Py_DECREF(one); + Py_DECREF(num); + num = temp; + if (num == NULL) + return NULL; + overflow = 0; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != -1) + return raiseTestError("test_long_long_and_overflow", + "return value was not set to -1"); + if (overflow != -1) + return raiseTestError("test_long_long_and_overflow", + "overflow was not set to -1"); + + /* Test that overflow is cleared properly for small values. */ + num = PyLong_FromString("FF", NULL, 16); + if (num == NULL) + return NULL; + overflow = 1234; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != 0xFF) + return raiseTestError("test_long_long_and_overflow", + "expected return value 0xFF"); + if (overflow != 0) + return raiseTestError("test_long_long_and_overflow", + "overflow was not cleared"); + + num = PyLong_FromString("-FF", NULL, 16); + if (num == NULL) + return NULL; + overflow = 0; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != -0xFF) + return raiseTestError("test_long_long_and_overflow", + "expected return value 0xFF"); + if (overflow != 0) + return raiseTestError("test_long_long_and_overflow", + "overflow was set incorrectly"); + + num = PyLong_FromLongLong(PY_LLONG_MAX); + if (num == NULL) + return NULL; + overflow = 1234; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != PY_LLONG_MAX) + return raiseTestError("test_long_long_and_overflow", + "expected return value PY_LLONG_MAX"); + if (overflow != 0) + return raiseTestError("test_long_long_and_overflow", + "overflow was not cleared"); + + num = PyLong_FromLongLong(PY_LLONG_MIN); + if (num == NULL) + return NULL; + overflow = 0; + value = PyLong_AsLongLongAndOverflow(num, &overflow); + Py_DECREF(num); + if (value == -1 && PyErr_Occurred()) + return NULL; + if (value != PY_LLONG_MIN) + return raiseTestError("test_long_long_and_overflow", + "expected return value PY_LLONG_MIN"); + if (overflow != 0) + return raiseTestError("test_long_long_and_overflow", + "overflow was not cleared"); + + Py_INCREF(Py_None); + return Py_None; +} + /* Test the L code for PyArg_ParseTuple. This should deliver a PY_LONG_LONG for both long and int arguments. The test may leak a little memory if it fails. @@ -1252,6 +1417,8 @@ {"getargs_L", getargs_L, METH_VARARGS}, {"getargs_K", getargs_K, METH_VARARGS}, {"test_longlong_api", test_longlong_api, METH_NOARGS}, + {"test_long_long_and_overflow", + (PyCFunction)test_long_long_and_overflow, METH_NOARGS}, {"test_L_code", (PyCFunction)test_L_code, METH_NOARGS}, {"codec_incrementalencoder", (PyCFunction)codec_incrementalencoder, METH_VARARGS}, Modified: python/trunk/Objects/longobject.c ============================================================================== --- python/trunk/Objects/longobject.c (original) +++ python/trunk/Objects/longobject.c Sat Jan 30 11:08:33 2010 @@ -821,6 +821,7 @@ */ #define IS_LITTLE_ENDIAN (int)*(unsigned char*)&one +#define PY_ABS_LLONG_MIN (0-(unsigned PY_LONG_LONG)PY_LLONG_MIN) /* Create a new long int object from a C PY_LONG_LONG int. */ @@ -1023,6 +1024,109 @@ } return x * sign; } + +/* Get a C long long int from a Python long or Python int object. + On overflow, returns -1 and sets *overflow to 1 or -1 depending + on the sign of the result. Otherwise *overflow is 0. + + For other errors (e.g., type error), returns -1 and sets an error + condition. +*/ + +PY_LONG_LONG +PyLong_AsLongLongAndOverflow(PyObject *vv, int *overflow) +{ + /* This version by Tim Peters */ + register PyLongObject *v; + unsigned PY_LONG_LONG x, prev; + PY_LONG_LONG res; + Py_ssize_t i; + int sign; + int do_decref = 0; /* if nb_int was called */ + + *overflow = 0; + if (vv == NULL) { + PyErr_BadInternalCall(); + return -1; + } + + if (PyInt_Check(vv)) + return PyInt_AsLong(vv); + + if (!PyLong_Check(vv)) { + PyNumberMethods *nb; + nb = vv->ob_type->tp_as_number; + if (nb == NULL || nb->nb_int == NULL) { + PyErr_SetString(PyExc_TypeError, + "an integer is required"); + return -1; + } + vv = (*nb->nb_int) (vv); + if (vv == NULL) + return -1; + do_decref = 1; + if(PyInt_Check(vv)) { + res = PyInt_AsLong(vv); + goto exit; + } + if (!PyLong_Check(vv)) { + Py_DECREF(vv); + PyErr_SetString(PyExc_TypeError, + "nb_int should return int object"); + return -1; + } + } + + res = -1; + v = (PyLongObject *)vv; + i = Py_SIZE(v); + + switch (i) { + case -1: + res = -(sdigit)v->ob_digit[0]; + break; + case 0: + res = 0; + break; + case 1: + res = v->ob_digit[0]; + break; + default: + sign = 1; + x = 0; + if (i < 0) { + sign = -1; + i = -(i); + } + while (--i >= 0) { + prev = x; + x = (x << PyLong_SHIFT) + v->ob_digit[i]; + if ((x >> PyLong_SHIFT) != prev) { + *overflow = sign; + goto exit; + } + } + /* Haven't lost any bits, but casting to long requires extra + * care (see comment above). + */ + if (x <= (unsigned PY_LONG_LONG)PY_LLONG_MAX) { + res = (PY_LONG_LONG)x * sign; + } + else if (sign < 0 && x == PY_ABS_LLONG_MIN) { + res = PY_LLONG_MIN; + } + else { + *overflow = sign; + /* res is already set to -1 */ + } + } + exit: + if (do_decref) { + Py_DECREF(vv); + } + return res; +} + #undef IS_LITTLE_ENDIAN #endif /* HAVE_LONG_LONG */

1 0

r77841 - in python/trunk/Lib/test: test_anydbm.py test_bsddb.py test_commands.py test_hotshot.py test_linuxaudiodev.py test_mailbox.py test_multifile.py test_pyclbr.py test_shelve.py test_transformer.py test_urllib2_localnet.py test_urllibnet.py test_whichdb.py test_xmllib.py
by ezio.melotti Jan. 30, 2010

Jan. 30, 2010

Author: ezio.melotti Date: Sat Jan 30 08:22:54 2010 New Revision: 77841 Log: #7092: silence py3k warnings for deprecated modules Modified: python/trunk/Lib/test/test_anydbm.py python/trunk/Lib/test/test_bsddb.py python/trunk/Lib/test/test_commands.py python/trunk/Lib/test/test_hotshot.py python/trunk/Lib/test/test_linuxaudiodev.py python/trunk/Lib/test/test_mailbox.py python/trunk/Lib/test/test_multifile.py python/trunk/Lib/test/test_pyclbr.py python/trunk/Lib/test/test_shelve.py python/trunk/Lib/test/test_transformer.py python/trunk/Lib/test/test_urllib2_localnet.py python/trunk/Lib/test/test_urllibnet.py python/trunk/Lib/test/test_whichdb.py python/trunk/Lib/test/test_xmllib.py Modified: python/trunk/Lib/test/test_anydbm.py ============================================================================== --- python/trunk/Lib/test/test_anydbm.py (original) +++ python/trunk/Lib/test/test_anydbm.py Sat Jan 30 08:22:54 2010 @@ -5,12 +5,14 @@ import os import unittest -import anydbm import glob from test import test_support _fname = test_support.TESTFN +# Silence Py3k warning +anydbm = test_support.import_module('anydbm', deprecated=True) + def _delete_files(): # we don't know the precise name the underlying database uses # so we use glob to locate all names Modified: python/trunk/Lib/test/test_bsddb.py ============================================================================== --- python/trunk/Lib/test/test_bsddb.py (original) +++ python/trunk/Lib/test/test_bsddb.py Sat Jan 30 08:22:54 2010 @@ -10,8 +10,9 @@ # Skip test if _bsddb wasn't built. test_support.import_module('_bsddb') -import bsddb -import dbhash # Just so we know it's imported +bsddb = test_support.import_module('bsddb', deprecated=True) +# Just so we know it's imported: +test_support.import_module('dbhash', deprecated=True) class TestBSDDB(unittest.TestCase): Modified: python/trunk/Lib/test/test_commands.py ============================================================================== --- python/trunk/Lib/test/test_commands.py (original) +++ python/trunk/Lib/test/test_commands.py Sat Jan 30 08:22:54 2010 @@ -9,7 +9,10 @@ warnings.filterwarnings('ignore', r".*commands.getstatus.. is deprecated", DeprecationWarning) -from test.test_support import run_unittest, reap_children +from test.test_support import run_unittest, reap_children, import_module + +# Silence Py3k warning +import_module('commands', deprecated=True) from commands import * # The module says: Modified: python/trunk/Lib/test/test_hotshot.py ============================================================================== --- python/trunk/Lib/test/test_hotshot.py (original) +++ python/trunk/Lib/test/test_hotshot.py Sat Jan 30 08:22:54 2010 @@ -1,5 +1,3 @@ -import hotshot -import hotshot.log import os import pprint import unittest @@ -9,6 +7,8 @@ from test import test_support +# Silence Py3k warning +hotshot = test_support.import_module('hotshot', deprecated=True) from hotshot.log import ENTER, EXIT, LINE Modified: python/trunk/Lib/test/test_linuxaudiodev.py ============================================================================== --- python/trunk/Lib/test/test_linuxaudiodev.py (original) +++ python/trunk/Lib/test/test_linuxaudiodev.py Sat Jan 30 08:22:54 2010 @@ -4,12 +4,13 @@ from test.test_support import findfile, run_unittest import errno -linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True) import sys -import sunaudio import audioop import unittest +linuxaudiodev = test_support.import_module('linuxaudiodev', deprecated=True) +sunaudio = test_support.import_module('sunaudio', deprecated=True) + SND_FORMAT_MULAW_8 = 1 class LinuxAudioDevTests(unittest.TestCase): Modified: python/trunk/Lib/test/test_mailbox.py ============================================================================== --- python/trunk/Lib/test/test_mailbox.py (original) +++ python/trunk/Lib/test/test_mailbox.py Sat Jan 30 08:22:54 2010 @@ -5,7 +5,6 @@ import socket import email import email.message -import rfc822 import re import StringIO from test import test_support @@ -17,6 +16,8 @@ except ImportError: pass +# Silence Py3k warning +rfc822 = test_support.import_module('rfc822', deprecated=True) class TestBase(unittest.TestCase): Modified: python/trunk/Lib/test/test_multifile.py ============================================================================== --- python/trunk/Lib/test/test_multifile.py (original) +++ python/trunk/Lib/test/test_multifile.py Sat Jan 30 08:22:54 2010 @@ -1,5 +1,5 @@ from test import test_support -import mimetools +mimetools = test_support.import_module('mimetools', deprecated=True) multifile = test_support.import_module('multifile', deprecated=True) import cStringIO Modified: python/trunk/Lib/test/test_pyclbr.py ============================================================================== --- python/trunk/Lib/test/test_pyclbr.py (original) +++ python/trunk/Lib/test/test_pyclbr.py Sat Jan 30 08:22:54 2010 @@ -2,7 +2,7 @@ Test cases for pyclbr.py Nick Mathewson ''' -from test.test_support import run_unittest +from test.test_support import run_unittest, import_module import sys from types import ClassType, FunctionType, MethodType, BuiltinFunctionType import pyclbr @@ -11,8 +11,10 @@ StaticMethodType = type(staticmethod(lambda: None)) ClassMethodType = type(classmethod(lambda c: None)) -# This next line triggers an error on old versions of pyclbr. +# Silence Py3k warning +import_module('commands', deprecated=True) +# This next line triggers an error on old versions of pyclbr. from commands import getstatus # Here we test the python class browser code. @@ -40,16 +42,16 @@ def assertHaskey(self, obj, key, ignore): - ''' succeed iff obj.has_key(key) or key in ignore. ''' + ''' succeed iff key in obj or key in ignore. ''' if key in ignore: return - if not obj.has_key(key): - print >>sys.stderr, "***",key - self.assertTrue(obj.has_key(key)) + if key not in obj: + print >>sys.stderr, "***", key + self.assertIn(key, obj) def assertEqualsOrIgnored(self, a, b, ignore): ''' succeed iff a == b or a in ignore or b in ignore ''' if a not in ignore and b not in ignore: - self.assertEquals(a, b) + self.assertEqual(a, b) def checkModule(self, moduleName, module=None, ignore=()): ''' succeed iff pyclbr.readmodule_ex(modulename) corresponds @@ -149,7 +151,9 @@ def test_easy(self): self.checkModule('pyclbr') self.checkModule('doctest', ignore=("DocTestCase",)) - self.checkModule('rfc822') + # Silence Py3k warning + rfc822 = import_module('rfc822', deprecated=True) + self.checkModule('rfc822', rfc822) self.checkModule('difflib') def test_decorators(self): Modified: python/trunk/Lib/test/test_shelve.py ============================================================================== --- python/trunk/Lib/test/test_shelve.py (original) +++ python/trunk/Lib/test/test_shelve.py Sat Jan 30 08:22:54 2010 @@ -4,6 +4,8 @@ import glob from test import test_support +test_support.import_module('anydbm', deprecated=True) + class TestCase(unittest.TestCase): fn = "shelftemp" + os.extsep + "db" Modified: python/trunk/Lib/test/test_transformer.py ============================================================================== --- python/trunk/Lib/test/test_transformer.py (original) +++ python/trunk/Lib/test/test_transformer.py Sat Jan 30 08:22:54 2010 @@ -1,5 +1,8 @@ import unittest from test import test_support + +# Silence Py3k warning +test_support.import_module('compiler', deprecated=True) from compiler import transformer, ast from compiler import compile Modified: python/trunk/Lib/test/test_urllib2_localnet.py ============================================================================== --- python/trunk/Lib/test/test_urllib2_localnet.py (original) +++ python/trunk/Lib/test/test_urllib2_localnet.py Sat Jan 30 08:22:54 2010 @@ -1,6 +1,5 @@ #!/usr/bin/env python -import mimetools import threading import urlparse import urllib2 @@ -8,6 +7,7 @@ import unittest import hashlib from test import test_support +mimetools = test_support.import_module('mimetools', deprecated=True) # Loopback http server infrastructure @@ -154,13 +154,13 @@ if len(self._users) == 0: return True - if not request_handler.headers.has_key('Proxy-Authorization'): + if 'Proxy-Authorization' not in request_handler.headers: return self._return_auth_challenge(request_handler) else: auth_dict = self._create_auth_dict( request_handler.headers['Proxy-Authorization'] ) - if self._users.has_key(auth_dict["username"]): + if auth_dict["username"] in self._users: password = self._users[ auth_dict["username"] ] else: return self._return_auth_challenge(request_handler) Modified: python/trunk/Lib/test/test_urllibnet.py ============================================================================== --- python/trunk/Lib/test/test_urllibnet.py (original) +++ python/trunk/Lib/test/test_urllibnet.py Sat Jan 30 08:22:54 2010 @@ -7,7 +7,7 @@ import urllib import sys import os -import mimetools +mimetools = test_support.import_module("mimetools", deprecated=True) def _open_with_retry(func, host, *args, **kwargs): Modified: python/trunk/Lib/test/test_whichdb.py ============================================================================== --- python/trunk/Lib/test/test_whichdb.py (original) +++ python/trunk/Lib/test/test_whichdb.py Sat Jan 30 08:22:54 2010 @@ -7,11 +7,13 @@ import test.test_support import unittest import whichdb -import anydbm import glob _fname = test.test_support.TESTFN +# Silence Py3k warning +anydbm = test.test_support.import_module('anydbm', deprecated=True) + def _delete_files(): # we don't know the precise name the underlying database uses # so we use glob to locate all names @@ -37,8 +39,9 @@ # we define a new test method for each # candidate database module. try: - mod = __import__(name) - except ImportError: + # Silence Py3k warning + mod = test.test_support.import_module(name, deprecated=True) + except unittest.SkipTest: continue def test_whichdb_name(self, name=name, mod=mod): Modified: python/trunk/Lib/test/test_xmllib.py ============================================================================== --- python/trunk/Lib/test/test_xmllib.py (original) +++ python/trunk/Lib/test/test_xmllib.py Sat Jan 30 08:22:54 2010 @@ -15,13 +15,10 @@ nsdoc = "<foo xmlns='URI' attr='val'/>" -import warnings -warnings.filterwarnings("ignore", ".* xmllib .* obsolete.*", - DeprecationWarning, r'xmllib$') - from test import test_support import unittest -import xmllib +# Silence Py3k warning +xmllib = test_support.import_module('xmllib', deprecated=True) class XMLParserTestCase(unittest.TestCase):

1 0

r77840 - python/branches/py3k
by victor.stinner Jan. 30, 2010

Jan. 30, 2010

Author: victor.stinner Date: Sat Jan 30 03:30:00 2010 New Revision: 77840 Log: Blocked revisions 77836 via svnmerge ........ r77836 | victor.stinner | 2010-01-30 03:00:26 +0100 (sam., 30 janv. 2010) | 2 lines #7801: fix xmlrpclib binary example, open the picture in binary mode ........ I wrote a different patch for the py3k (r77838). Modified: python/branches/py3k/ (props changed)

1 0

r77839 - in python/branches/release31-maint: Doc/library/xmlrpc.client.rst
by victor.stinner Jan. 30, 2010

Jan. 30, 2010

Author: victor.stinner Date: Sat Jan 30 03:19:14 2010 New Revision: 77839 Log: Merged revisions 77838 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r77838 | victor.stinner | 2010-01-30 03:16:55 +0100 (sam., 30 janv. 2010) | 4 lines #7801: fix xmlrpclib binary example, open the picture in binary mode Use also the with syntax (consistent with python trunk example). ........ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/library/xmlrpc.client.rst Modified: python/branches/release31-maint/Doc/library/xmlrpc.client.rst ============================================================================== --- python/branches/release31-maint/Doc/library/xmlrpc.client.rst (original) +++ python/branches/release31-maint/Doc/library/xmlrpc.client.rst Sat Jan 30 03:19:14 2010 @@ -283,9 +283,8 @@ import xmlrpc.client def python_logo(): - handle = open("python_logo.jpg") - return xmlrpc.client.Binary(handle.read()) - handle.close() + with open("python_logo.jpg", "rb") as handle: + return xmlrpc.client.Binary(handle.read()) server = SimpleXMLRPCServer(("localhost", 8000)) print("Listening on port 8000...") @@ -298,9 +297,8 @@ import xmlrpc.client proxy = xmlrpc.client.ServerProxy("http://localhost:8000/") - handle = open("fetched_python_logo.jpg", "w") - handle.write(proxy.python_logo().data) - handle.close() + with open("fetched_python_logo.jpg", "wb") as handle: + handle.write(proxy.python_logo().data) .. _fault-objects:

1 0

r77838 - python/branches/py3k/Doc/library/xmlrpc.client.rst
by victor.stinner Jan. 30, 2010

Jan. 30, 2010

Author: victor.stinner Date: Sat Jan 30 03:16:55 2010 New Revision: 77838 Log: #7801: fix xmlrpclib binary example, open the picture in binary mode Use also the with syntax (consistent with python trunk example). Modified: python/branches/py3k/Doc/library/xmlrpc.client.rst Modified: python/branches/py3k/Doc/library/xmlrpc.client.rst ============================================================================== --- python/branches/py3k/Doc/library/xmlrpc.client.rst (original) +++ python/branches/py3k/Doc/library/xmlrpc.client.rst Sat Jan 30 03:16:55 2010 @@ -283,9 +283,8 @@ import xmlrpc.client def python_logo(): - handle = open("python_logo.jpg") - return xmlrpc.client.Binary(handle.read()) - handle.close() + with open("python_logo.jpg", "rb") as handle: + return xmlrpc.client.Binary(handle.read()) server = SimpleXMLRPCServer(("localhost", 8000)) print("Listening on port 8000...") @@ -298,9 +297,8 @@ import xmlrpc.client proxy = xmlrpc.client.ServerProxy("http://localhost:8000/") - handle = open("fetched_python_logo.jpg", "w") - handle.write(proxy.python_logo().data) - handle.close() + with open("fetched_python_logo.jpg", "wb") as handle: + handle.write(proxy.python_logo().data) .. _fault-objects:

1 0

r77837 - in python/branches/release26-maint: Doc/library/xmlrpclib.rst
by victor.stinner Jan. 30, 2010

Jan. 30, 2010

Author: victor.stinner Date: Sat Jan 30 03:04:58 2010 New Revision: 77837 Log: Merged revisions 77836 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77836 | victor.stinner | 2010-01-30 03:00:26 +0100 (sam., 30 janv. 2010) | 2 lines #7801: fix xmlrpclib binary example, open the picture in binary mode ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/library/xmlrpclib.rst Modified: python/branches/release26-maint/Doc/library/xmlrpclib.rst ============================================================================== --- python/branches/release26-maint/Doc/library/xmlrpclib.rst (original) +++ python/branches/release26-maint/Doc/library/xmlrpclib.rst Sat Jan 30 03:04:58 2010 @@ -318,7 +318,7 @@ import xmlrpclib def python_logo(): - with open("python_logo.jpg") as handle: + with open("python_logo.jpg", "rb") as handle: return xmlrpclib.Binary(handle.read()) server = SimpleXMLRPCServer(("localhost", 8000)) @@ -332,7 +332,7 @@ import xmlrpclib proxy = xmlrpclib.ServerProxy("http://localhost:8000/") - with open("fetched_python_logo.jpg", "w") as handle: + with open("fetched_python_logo.jpg", "wb") as handle: handle.write(proxy.python_logo().data) .. _fault-objects:

1 0

r77836 - python/trunk/Doc/library/xmlrpclib.rst
by victor.stinner Jan. 30, 2010

Jan. 30, 2010

Author: victor.stinner Date: Sat Jan 30 03:00:26 2010 New Revision: 77836 Log: #7801: fix xmlrpclib binary example, open the picture in binary mode Modified: python/trunk/Doc/library/xmlrpclib.rst Modified: python/trunk/Doc/library/xmlrpclib.rst ============================================================================== --- python/trunk/Doc/library/xmlrpclib.rst (original) +++ python/trunk/Doc/library/xmlrpclib.rst Sat Jan 30 03:00:26 2010 @@ -318,7 +318,7 @@ import xmlrpclib def python_logo(): - with open("python_logo.jpg") as handle: + with open("python_logo.jpg", "rb") as handle: return xmlrpclib.Binary(handle.read()) server = SimpleXMLRPCServer(("localhost", 8000)) @@ -332,7 +332,7 @@ import xmlrpclib proxy = xmlrpclib.ServerProxy("http://localhost:8000/") - with open("fetched_python_logo.jpg", "w") as handle: + with open("fetched_python_logo.jpg", "wb") as handle: handle.write(proxy.python_logo().data) .. _fault-objects:

1 0

Python Regression Test Failures refleak (1)
by Neal Norwitz Jan. 30, 2010

Jan. 30, 2010

More important issues: ---------------------- test_bz2 leaked [0, 0, 84] references, sum=84 Less important issues: ---------------------- test_popen2 leaked [-29, 54, -54] references, sum=-29

1 0

r77835 - in python/branches/py3k: Misc/developers.txt
by martin.v.loewis Jan. 30, 2010

Jan. 30, 2010

Author: martin.v.loewis Date: Sat Jan 30 01:16:49 2010 New Revision: 77835 Log: Merged revisions 77834 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77834 | martin.v.loewis | 2010-01-30 01:15:44 +0100 (Sa, 30 Jan 2010) | 2 lines Add Victor Stinner. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Misc/developers.txt Modified: python/branches/py3k/Misc/developers.txt ============================================================================== --- python/branches/py3k/Misc/developers.txt (original) +++ python/branches/py3k/Misc/developers.txt Sat Jan 30 01:16:49 2010 @@ -20,6 +20,9 @@ Permissions History ------------------- +- Victor Stinner was given SVN access on January 30 2010 by MvL, + at recommendation by Mark Dickinson and Amaury Forgeot d'Arc. + - Stefan Krah was given SVN access on January 5 2010 by GFB, at suggestion of Mark Dickinson, for work on the decimal module.

1 0

r77834 - python/trunk/Misc/developers.txt
by martin.v.loewis Jan. 30, 2010

Jan. 30, 2010

Author: martin.v.loewis Date: Sat Jan 30 01:15:44 2010 New Revision: 77834 Log: Add Victor Stinner. Modified: python/trunk/Misc/developers.txt Modified: python/trunk/Misc/developers.txt ============================================================================== --- python/trunk/Misc/developers.txt (original) +++ python/trunk/Misc/developers.txt Sat Jan 30 01:15:44 2010 @@ -20,6 +20,9 @@ Permissions History ------------------- +- Victor Stinner was given SVN access on January 30 2010 by MvL, + at recommendation by Mark Dickinson and Amaury Forgeot d'Arc. + - Stefan Krah was given SVN access on January 5 2010 by GFB, at suggestion of Mark Dickinson, for work on the decimal module.

1 0