Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c3f30c4

Browse files
committed
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r60901 | eric.smith | 2008-02-19 14:21:56 +0100 (Tue, 19 Feb 2008) | 1 line Added PEP 3101. ........ r60907 | georg.brandl | 2008-02-20 20:12:36 +0100 (Wed, 20 Feb 2008) | 2 lines Fixes contributed by Ori Avtalion. ........ r60909 | eric.smith | 2008-02-21 00:34:22 +0100 (Thu, 21 Feb 2008) | 1 line Trim leading zeros from a floating point exponent, per C99. See issue 1600. As far as I know, this only affects Windows. Add float type 'n' to PyOS_ascii_formatd (see PEP 3101 for 'n' description). ........ r60910 | eric.smith | 2008-02-21 00:39:28 +0100 (Thu, 21 Feb 2008) | 1 line Now that PyOS_ascii_formatd supports the 'n' format, simplify the float formatting code to just call it. ........ r60918 | andrew.kuchling | 2008-02-21 15:23:38 +0100 (Thu, 21 Feb 2008) | 2 lines Close manifest file. This change doesn't make any difference to CPython, but is a necessary fix for Jython. ........ r60921 | guido.van.rossum | 2008-02-21 18:46:16 +0100 (Thu, 21 Feb 2008) | 2 lines Remove news about float repr() -- issue 1580 is still in limbo. ........ r60923 | guido.van.rossum | 2008-02-21 19:18:37 +0100 (Thu, 21 Feb 2008) | 5 lines Removed uses of dict.has_key() from distutils, and uses of callable() from copy_reg.py, so the interpreter now starts up without warnings when '-3' is given. More work like this needs to be done in the rest of the stdlib. ........ r60924 | thomas.heller | 2008-02-21 19:28:48 +0100 (Thu, 21 Feb 2008) | 4 lines configure.ac: Remove the configure check for _Bool, it is already done in the top-level Python configure script. configure, fficonfig.h.in: regenerated. ........ r60925 | thomas.heller | 2008-02-21 19:52:20 +0100 (Thu, 21 Feb 2008) | 3 lines Replace 'has_key()' with 'in'. Replace 'raise Error, stuff' with 'raise Error(stuff)'. ........ r60927 | raymond.hettinger | 2008-02-21 20:24:53 +0100 (Thu, 21 Feb 2008) | 1 line Update more instances of has_key(). ........ r60928 | guido.van.rossum | 2008-02-21 20:46:35 +0100 (Thu, 21 Feb 2008) | 3 lines Fix a few typos and layout glitches (more work is needed). Move 2.5 news to Misc/HISTORY. ........ r60936 | georg.brandl | 2008-02-21 21:33:38 +0100 (Thu, 21 Feb 2008) | 2 lines #2079: typo in userdict docs. ........ r60938 | georg.brandl | 2008-02-21 21:38:13 +0100 (Thu, 21 Feb 2008) | 2 lines Part of #2154: minimal syntax fixes in doc example snippets. ........ r60942 | raymond.hettinger | 2008-02-22 04:16:42 +0100 (Fri, 22 Feb 2008) | 1 line First draft for itertools.product(). Docs and other updates forthcoming. ........ r60955 | nick.coghlan | 2008-02-22 11:54:06 +0100 (Fri, 22 Feb 2008) | 1 line Try to make command line error messages from runpy easier to understand (and suppress traceback cruft from the implicitly invoked runpy machinery) ........ r60956 | georg.brandl | 2008-02-22 13:31:45 +0100 (Fri, 22 Feb 2008) | 2 lines A lot more typo fixes by Ori Avtalion. ........ r60957 | georg.brandl | 2008-02-22 13:56:34 +0100 (Fri, 22 Feb 2008) | 2 lines Don't reference pyshell. ........ r60958 | georg.brandl | 2008-02-22 13:57:05 +0100 (Fri, 22 Feb 2008) | 2 lines Another fix. ........
1 parent 86bc179 commit c3f30c4

41 files changed

Lines changed: 5675 additions & 3305 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Doc/c-api/long.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ All integers are implemented as "long" integer objects of arbitrary size.
190190

191191
.. cfunction:: void* PyLong_AsVoidPtr(PyObject *pylong)
192192

193-
Convert a Python integer *pylong* to a C :ctype:`void` pointer. If *pylong*
194-
cannot be converted, an :exc:`OverflowError` will be raised. This is only
195-
assured to produce a usable :ctype:`void` pointer for values created with
196-
:cfunc:`PyLong_FromVoidPtr`.
193+
Convert a Python integer *pylong* to a C :ctype:`void` pointer.
194+
If *pylong* cannot be converted, an :exc:`OverflowError` will be raised. This
195+
is only assured to produce a usable :ctype:`void` pointer for values created
196+
with :cfunc:`PyLong_FromVoidPtr`.

Doc/c-api/objbuffer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Buffer Protocol
88

99
.. cfunction:: int PyObject_AsCharBuffer(PyObject *obj, const char **buffer, Py_ssize_t *buffer_len)
1010

11-
Returns a pointer to a read-only memory location useable as character- based
11+
Returns a pointer to a read-only memory location usable as character-based
1212
input. The *obj* argument must support the single-segment character buffer
1313
interface. On success, returns ``0``, sets *buffer* to the memory location and
1414
*buffer_len* to the buffer length. Returns ``-1`` and sets a :exc:`TypeError`

Doc/c-api/typeobj.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ The following three fields only exist if the
560560
The :attr:`tp_traverse` pointer is used by the garbage collector to detect
561561
reference cycles. A typical implementation of a :attr:`tp_traverse` function
562562
simply calls :cfunc:`Py_VISIT` on each of the instance's members that are Python
563-
objects. For exampe, this is function :cfunc:`local_traverse` from the
563+
objects. For example, this is function :cfunc:`local_traverse` from the
564564
:mod:`thread` extension module::
565565

566566
static int

Doc/distutils/builtdist.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Distutils configuration files. Various options and sections in the
195195
| | or --- & :option:`maintainer` and |
196196
| | :option:`maintainer_email` |
197197
+------------------------------------------+----------------------------------------------+
198-
| Copyright | :option:`licence` |
198+
| Copyright | :option:`license` |
199199
+------------------------------------------+----------------------------------------------+
200200
| Url | :option:`url` |
201201
+------------------------------------------+----------------------------------------------+

Doc/distutils/packageindex.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ the web interface.
5353
The .pypirc file
5454
================
5555

56-
The format of the :file:`.pypirc` file is formated as follows::
56+
The format of the :file:`.pypirc` file is as follows::
5757

5858
[server-login]
5959
repository: <repository-url>
6060
username: <username>
6161
password: <password>
6262

63-
*repository* can be ommitted and defaults to ``http://www.python.org/pypi``.
63+
*repository* can be omitted and defaults to ``http://www.python.org/pypi``.
6464

6565

Doc/distutils/setupscript.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ If you have a number of extensions all in the same package (or all under the
185185
same base package), use the :option:`ext_package` keyword argument to
186186
:func:`setup`. For example, ::
187187

188-
setup(...
188+
setup(...,
189189
ext_package='pkg',
190190
ext_modules=[Extension('foo', ['foo.c']),
191191
Extension('subpkg.bar', ['bar.c'])],
@@ -214,7 +214,7 @@ extension.
214214
This warning notwithstanding, options to SWIG can be currently passed like
215215
this::
216216

217-
setup(...
217+
setup(...,
218218
ext_modules=[Extension('_foo', ['foo.i'],
219219
swig_opts=['-modern', '-I../include'])],
220220
py_modules=['foo'],
@@ -443,7 +443,7 @@ option will allow the interpreter path to be explicitly overridden.
443443
The :option:`scripts` option simply is a list of files to be handled in this
444444
way. From the PyXML setup script::
445445

446-
setup(...
446+
setup(...,
447447
scripts=['scripts/xmlproc_parse', 'scripts/xmlproc_val']
448448
)
449449

@@ -499,7 +499,7 @@ anything which doesn't fit in the previous categories.
499499
:option:`data_files` specifies a sequence of (*directory*, *files*) pairs in the
500500
following way::
501501

502-
setup(...
502+
setup(...,
503503
data_files=[('bitmaps', ['bm/b1.gif', 'bm/b2.gif']),
504504
('config', ['cfg/data.cfg']),
505505
('/etc/init.d', ['init-script'])]
@@ -611,7 +611,7 @@ information is sometimes used to indicate sub-releases. These are
611611

612612
:option:`classifiers` are specified in a python list::
613613

614-
setup(...
614+
setup(...,
615615
classifiers=[
616616
'Development Status :: 4 - Beta',
617617
'Environment :: Console',

Doc/howto/advocacy.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ language, but it boils down to three conditions:
276276
product in any way.
277277

278278
* If something goes wrong, you can't sue for damages. Practically all software
279-
licences contain this condition.
279+
licenses contain this condition.
280280

281281
Notice that you don't have to provide source code for anything that contains
282282
Python or is built with it. Also, the Python interpreter and accompanying

Doc/howto/doanddont.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ from module import name1, name2
8181
This is a "don't" which is much weaker then the previous "don't"s but is still
8282
something you should not do if you don't have good reasons to do that. The
8383
reason it is usually bad idea is because you suddenly have an object which lives
84-
in two seperate namespaces. When the binding in one namespace changes, the
84+
in two separate namespaces. When the binding in one namespace changes, the
8585
binding in the other will not, so there will be a discrepancy between them. This
8686
happens when, for example, one module is reloaded, or changes the definition of
8787
a function at runtime.

Doc/howto/functional.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ returns them in a tuple::
892892
itertools.izip(['a', 'b', 'c'], (1, 2, 3)) =>
893893
('a', 1), ('b', 2), ('c', 3)
894894

895-
It's similiar to the built-in :func:`zip` function, but doesn't construct an
895+
It's similar to the built-in :func:`zip` function, but doesn't construct an
896896
in-memory list and exhaust all the input iterators before returning; instead
897897
tuples are constructed and returned only if they're requested. (The technical
898898
term for this behaviour is `lazy evaluation

Doc/howto/sockets.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ thing to do - give it a nice long timeout (say a minute) unless you have good
354354
reason to do otherwise.
355355

356356
In return, you will get three lists. They have the sockets that are actually
357-
readable, writable and in error. Each of these lists is a subset (possbily
357+
readable, writable and in error. Each of these lists is a subset (possibly
358358
empty) of the corresponding list you passed in. And if you put a socket in more
359359
than one input list, it will only be (at most) in one output list.
360360

@@ -368,7 +368,7 @@ just means outbound network buffer space is available.)
368368
If you have a "server" socket, put it in the potential_readers list. If it comes
369369
out in the readable list, your ``accept`` will (almost certainly) work. If you
370370
have created a new socket to ``connect`` to someone else, put it in the
371-
ptoential_writers list. If it shows up in the writable list, you have a decent
371+
potential_writers list. If it shows up in the writable list, you have a decent
372372
chance that it has connected.
373373

374374
One very nasty problem with ``select``: if somewhere in those input lists of

0 commit comments

Comments
 (0)