Mailman 3 January 2010 - Python-checkins

r77860 - python/branches/release31-maint
by mark.dickinson Jan. 30, 2010

Jan. 30, 2010

Author: mark.dickinson Date: Sat Jan 30 19:06:52 2010 New Revision: 77860 Log: Blocked revisions 77859 via svnmerge ........ r77859 | mark.dickinson | 2010-01-30 18:06:17 +0000 (Sat, 30 Jan 2010) | 1 line Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions. ........ Modified: python/branches/release31-maint/ (props changed)

1 0

r77859 - python/branches/py3k/Objects/longobject.c
by mark.dickinson Jan. 30, 2010

Jan. 30, 2010

Author: mark.dickinson Date: Sat Jan 30 19:06:17 2010 New Revision: 77859 Log: Move docstrings for long.to_bytes and long.from_bytes after the corresponding functions. Modified: python/branches/py3k/Objects/longobject.c Modified: python/branches/py3k/Objects/longobject.c ============================================================================== --- python/branches/py3k/Objects/longobject.c (original) +++ python/branches/py3k/Objects/longobject.c Sat Jan 30 19:06:17 2010 @@ -4393,25 +4393,6 @@ #endif -PyDoc_STRVAR(long_to_bytes_doc, -"int.to_bytes(length, byteorder, *, signed=False) -> bytes\n\ -\n\ -Return an array of bytes representing an integer.\n\ -\n\ -The integer is represented using length bytes. An OverflowError is\n\ -raised if the integer is not representable with the given number of\n\ -bytes.\n\ -\n\ -The byteorder argument determines the byte order used to represent the\n\ -integer. If byteorder is 'big', the most significant byte is at the\n\ -beginning of the byte array. If byteorder is 'little', the most\n\ -significant byte is at the end of the byte array. To request the native\n\ -byte order of the host system, use `sys.byteorder' as the byte order value.\n\ -\n\ -The signed keyword-only argument determines whether two's complement is\n\ -used to represent the integer. If signed is False and a negative integer\n\ -is given, an OverflowError is raised."); - static PyObject * long_to_bytes(PyLongObject *v, PyObject *args, PyObject *kwds) { @@ -4475,14 +4456,14 @@ return bytes; } -PyDoc_STRVAR(long_from_bytes_doc, -"int.from_bytes(bytes, byteorder, *, signed=False) -> int\n\ +PyDoc_STRVAR(long_to_bytes_doc, +"int.to_bytes(length, byteorder, *, signed=False) -> bytes\n\ \n\ -Return the integer represented by the given array of bytes.\n\ +Return an array of bytes representing an integer.\n\ \n\ -The bytes argument must either support the buffer protocol or be an\n\ -iterable object producing bytes. Bytes and bytearray are examples of\n\ -built-in objects that support the buffer protocol.\n\ +The integer is represented using length bytes. An OverflowError is\n\ +raised if the integer is not representable with the given number of\n\ +bytes.\n\ \n\ The byteorder argument determines the byte order used to represent the\n\ integer. If byteorder is 'big', the most significant byte is at the\n\ @@ -4490,8 +4471,9 @@ significant byte is at the end of the byte array. To request the native\n\ byte order of the host system, use `sys.byteorder' as the byte order value.\n\ \n\ -The signed keyword-only argument indicates whether two's complement is\n\ -used to represent the integer."); +The signed keyword-only argument determines whether two's complement is\n\ +used to represent the integer. If signed is False and a negative integer\n\ +is given, an OverflowError is raised."); static PyObject * long_from_bytes(PyTypeObject *type, PyObject *args, PyObject *kwds) @@ -4573,6 +4555,24 @@ return long_obj; } +PyDoc_STRVAR(long_from_bytes_doc, +"int.from_bytes(bytes, byteorder, *, signed=False) -> int\n\ +\n\ +Return the integer represented by the given array of bytes.\n\ +\n\ +The bytes argument must either support the buffer protocol or be an\n\ +iterable object producing bytes. Bytes and bytearray are examples of\n\ +built-in objects that support the buffer protocol.\n\ +\n\ +The byteorder argument determines the byte order used to represent the\n\ +integer. If byteorder is 'big', the most significant byte is at the\n\ +beginning of the byte array. If byteorder is 'little', the most\n\ +significant byte is at the end of the byte array. To request the native\n\ +byte order of the host system, use `sys.byteorder' as the byte order value.\n\ +\n\ +The signed keyword-only argument indicates whether two's complement is\n\ +used to represent the integer."); + static PyMethodDef long_methods[] = { {"conjugate", (PyCFunction)long_long, METH_NOARGS, "Returns self, the complex conjugate of any int."},

1 0

r77858 - python/trunk/Doc/library/xmlrpclib.rst
by georg.brandl Jan. 30, 2010

Jan. 30, 2010

Author: georg.brandl Date: Sat Jan 30 18:57:48 2010 New Revision: 77858 Log: #7802: fix invalid example (heh). 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 18:57:48 2010 @@ -414,12 +414,12 @@ error. In the following example we're going to intentionally cause a :exc:`ProtocolError` -by providing an invalid URI:: +by providing an URI that doesn't point to an XMLRPC server:: import xmlrpclib - # create a ServerProxy with an invalid URI - proxy = xmlrpclib.ServerProxy("http://invalidaddress/") + # create a ServerProxy with an URI that doesn't respond to XMLRPC requests + proxy = xmlrpclib.ServerProxy("http://www.google.com/") try: proxy.some_method()

1 0

r77857 - python/branches/py3k/Doc/library/xmlrpc.server.rst
by georg.brandl Jan. 30, 2010

Jan. 30, 2010

Author: georg.brandl Date: Sat Jan 30 18:54:04 2010 New Revision: 77857 Log: #7814: fix wrong example function usage. Modified: python/branches/py3k/Doc/library/xmlrpc.server.rst Modified: python/branches/py3k/Doc/library/xmlrpc.server.rst ============================================================================== --- python/branches/py3k/Doc/library/xmlrpc.server.rst (original) +++ python/branches/py3k/Doc/library/xmlrpc.server.rst Sat Jan 30 18:54:04 2010 @@ -136,10 +136,10 @@ server.register_function(adder_function, 'add') # Register an instance; all the methods of the instance are - # published as XML-RPC methods (in this case, just 'div'). + # published as XML-RPC methods (in this case, just 'mul'). class MyFuncs: - def div(self, x, y): - return x // y + def mul(self, x, y): + return x * y server.register_instance(MyFuncs()) @@ -209,7 +209,8 @@ Example:: class MyFuncs: - def div(self, x, y) : return x // y + def mul(self, x, y): + return x * y handler = CGIXMLRPCRequestHandler()

1 0

r77856 - sandbox/trunk/2to3/lib2to3/fixes/fix_metaclass.py
by benjamin.peterson Jan. 30, 2010

Jan. 30, 2010

Author: benjamin.peterson Date: Sat Jan 30 17:35:29 2010 New Revision: 77856 Log: return None to indicate no change Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_metaclass.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_metaclass.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_metaclass.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_metaclass.py Sat Jan 30 17:35:29 2010 @@ -150,7 +150,7 @@ def transform(self, node, results): if not has_metaclass(node): - return node + return fixup_parse_tree(node)

1 0

r77855 - sandbox/trunk/2to3/lib2to3/fixes/fix_tuple_params.py
by benjamin.peterson Jan. 30, 2010

Jan. 30, 2010

Author: benjamin.peterson Date: Sat Jan 30 17:32:05 2010 New Revision: 77855 Log: don't return node if it is not changed Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_tuple_params.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_tuple_params.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_tuple_params.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_tuple_params.py Sat Jan 30 17:32:05 2010 @@ -81,7 +81,7 @@ handle_tuple(arg, add_prefix=(i > 0)) if not new_lines: - return node + return # This isn't strictly necessary, but it plays nicely with other fixers. # TODO(cwinter) get rid of this when children becomes a smart list

1 0

Re: [Python-checkins] r77788 - python/trunk/Lib/UserDict.py
by M.-A. Lemburg Jan. 30, 2010

Jan. 30, 2010

benjamin.peterson wrote: > Author: benjamin.peterson > Date: Wed Jan 27 03:15:28 2010 > New Revision: 77788 > > Log: > for UserDict to be compatible with abcs, it must subclass object Please add a clear mention of this change to Misc/NEWS - it could break existing applications that rely on UserDict being an old-style class. Thanks. > Modified: > python/trunk/Lib/UserDict.py > > Modified: python/trunk/Lib/UserDict.py > ============================================================================== > --- python/trunk/Lib/UserDict.py (original) > +++ python/trunk/Lib/UserDict.py Wed Jan 27 03:15:28 2010 > @@ -1,6 +1,6 @@ > """A more or less complete user-defined wrapper around dictionary objects.""" > > -class UserDict: > +class UserDict(object): > def __init__(self, dict=None, **kwargs): > self.data = {} > if dict is not None: > _______________________________________________ > Python-checkins mailing list > Python-checkins(a)python.org > http://mail.python.org/mailman/listinfo/python-checkins -- Marc-Andre Lemburg eGenix.com Professional Python Services directly from the Source (#1, Jan 27 2010) >>> Python/Zope Consulting and Support ... http://www.egenix.com/ >>> mxODBC.Zope.Database.Adapter ... http://zope.egenix.com/ >>> mxODBC, mxDateTime, mxTextTools ... http://python.egenix.com/ ________________________________________________________________________ ::: Try our new mxODBC.Connect Python Database Interface for free ! :::: eGenix.com Software, Skills and Services GmbH Pastor-Loeh-Str.48 D-40764 Langenfeld, Germany. CEO Dipl.-Math. Marc-Andre Lemburg Registered at Amtsgericht Duesseldorf: HRB 46611 http://www.egenix.com/company/contact/

2 3

r77854 - python/branches/release31-maint
by ezio.melotti Jan. 30, 2010

Jan. 30, 2010

Author: ezio.melotti Date: Sat Jan 30 14:35:06 2010 New Revision: 77854 Log: Blocked revisions 77852 via svnmerge ................ r77852 | ezio.melotti | 2010-01-30 15:32:14 +0200 (Sat, 30 Jan 2010) | 13 lines Merged revisions 77850-77851 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77850 | ezio.melotti | 2010-01-30 15:08:54 +0200 (Sat, 30 Jan 2010) | 1 line Relocate a couple of stars and remove redundant backticks ........ r77851 | ezio.melotti | 2010-01-30 15:27:05 +0200 (Sat, 30 Jan 2010) | 1 line Use the correct markup for args ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r77853 - python/branches/release26-maint
by ezio.melotti Jan. 30, 2010

Jan. 30, 2010

Author: ezio.melotti Date: Sat Jan 30 14:33:39 2010 New Revision: 77853 Log: Blocked revisions 77850-77851 via svnmerge ........ r77850 | ezio.melotti | 2010-01-30 15:08:54 +0200 (Sat, 30 Jan 2010) | 1 line Relocate a couple of stars and remove redundant backticks ........ r77851 | ezio.melotti | 2010-01-30 15:27:05 +0200 (Sat, 30 Jan 2010) | 1 line Use the correct markup for args ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r77852 - in python/branches/py3k: Doc/c-api/long.rst
by ezio.melotti Jan. 30, 2010

Jan. 30, 2010

Author: ezio.melotti Date: Sat Jan 30 14:32:14 2010 New Revision: 77852 Log: Merged revisions 77850-77851 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77850 | ezio.melotti | 2010-01-30 15:08:54 +0200 (Sat, 30 Jan 2010) | 1 line Relocate a couple of stars and remove redundant backticks ........ r77851 | ezio.melotti | 2010-01-30 15:27:05 +0200 (Sat, 30 Jan 2010) | 1 line Use the correct markup for args ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/c-api/long.rst Modified: python/branches/py3k/Doc/c-api/long.rst ============================================================================== --- python/branches/py3k/Doc/c-api/long.rst (original) +++ python/branches/py3k/Doc/c-api/long.rst Sat Jan 30 14:32:14 2010 @@ -84,7 +84,7 @@ Return a new :ctype:`PyLongObject` based on the string value in *str*, which is interpreted according to the radix in *base*. If *pend* is non-*NULL*, - ``*pend`` will point to the first character in *str* which follows the + *\*pend* will point to the first character in *str* which follows the representation of the number. If *base* is ``0``, the radix will be determined based on the leading characters of *str*: if *str* starts with ``'0x'`` or ``'0X'``, radix 16 will be used; if *str* starts with ``'0o'`` or @@ -119,25 +119,25 @@ and return -1. Convert non-long objects automatically to long first, and return -1 if that raises exceptions. -.. cfunction:: long PyLong_AsLongAndOverflow(PyObject *pylong, int* overflow) +.. cfunction:: long PyLong_AsLongAndOverflow(PyObject *pylong, int *overflow) Return a C :ctype:`long` representation of the contents of *pylong*. If *pylong* is greater than :const:`LONG_MAX` or less - than :const:`LONG_MIN`, set `*overflow` to ``1`` or ``-1``, - respectively, and return ``-1``; otherwise, set `*overflow` to + than :const:`LONG_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 + MemoryError), then ``-1`` will be returned and *\*overflow* will be ``0``. -.. cfunction:: PY_LONG_LONG PyLong_AsLongLongAndOverflow(PyObject *pylong, int* overflow) +.. 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 + 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 + MemoryError), then ``-1`` will be returned and *\*overflow* will be ``0``. .. versionadded:: 3.2

1 0