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

Skip to content

Commit 1b5ab45

Browse files
birkenfeldbirkenfeld
committed
Merged revisions 74328,74332-74333,74365 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r74328 | georg.brandl | 2009-08-06 17:06:25 +0200 (Do, 06 Aug 2009) | 1 line Fix base keyword arg name for int() and long(). ........ r74332 | georg.brandl | 2009-08-06 19:23:21 +0200 (Do, 06 Aug 2009) | 1 line Fix punctuation and one copy-paste error. ........ r74333 | georg.brandl | 2009-08-06 19:43:55 +0200 (Do, 06 Aug 2009) | 1 line #6658: fix two typos. ........ r74365 | georg.brandl | 2009-08-13 09:48:05 +0200 (Do, 13 Aug 2009) | 1 line #6679: Remove mention that sub supports no flags. ........
1 parent d07ac64 commit 1b5ab45

4 files changed

Lines changed: 16 additions & 21 deletions

File tree

‎Doc/c-api/buffer.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ Buffer related functions
144144
kind of buffer the caller is prepared to deal with and therefore what
145145
kind of buffer the exporter is allowed to return. The buffer interface
146146
allows for complicated memory sharing possibilities, but some caller may
147-
not be able to handle all the complexibity but may want to see if the
147+
not be able to handle all the complexity but may want to see if the
148148
exporter will let them take a simpler view to its memory.
149149

150150
Some exporters may not be able to share memory in every possible way and

‎Doc/library/functions.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,18 +514,18 @@ are always available. They are listed here in alphabetical order.
514514
to provide elaborate line editing and history features.
515515

516516

517-
.. function:: int([number | string[, radix]])
517+
.. function:: int([number | string[, base]])
518518

519519
Convert a number or string to an integer. If no arguments are given, return
520520
``0``. If a number is given, return ``number.__int__()``. Conversion of
521521
floating point numbers to integers truncates towards zero. A string must be
522522
a base-radix integer literal optionally preceded by '+' or '-' (with no space
523523
in between) and optionally surrounded by whitespace. A base-n literal
524524
consists of the digits 0 to n-1, with 'a' to 'z' (or 'A' to 'Z') having
525-
values 10 to 35. The default radix is 10. The allowed values are 0 and 2-36.
525+
values 10 to 35. The default *base* is 10. The allowed values are 0 and 2-36.
526526
Base-2, -8, and -16 literals can be optionally prefixed with ``0b``/``0B``,
527-
``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code. Radix 0
528-
means to interpret exactly as a code literal, so that the actual radix is 2,
527+
``0o``/``0O``, or ``0x``/``0X``, as with integer literals in code. Base 0
528+
means to interpret exactly as a code literal, so that the actual base is 2,
529529
8, 10, or 16, and so that ``int('010', 0)`` is not legal, while
530530
``int('010')`` is, as well as ``int('010', 8)``.
531531

‎Doc/library/re.rst‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -656,9 +656,7 @@ form.
656656
>>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE)
657657
'Baked Beans & Spam'
658658

659-
The pattern may be a string or an RE object; if you need to specify regular
660-
expression flags, you must use a RE object, or use embedded modifiers in a
661-
pattern; for example, ``sub("(?i)b+", "x", "bbbb BBBB")`` returns ``'x x'``.
659+
The pattern may be a string or an RE object.
662660

663661
The optional argument *count* is the maximum number of pattern occurrences to be
664662
replaced; *count* must be a non-negative integer. If omitted or zero, all

‎Doc/library/select.rst‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
308308

309309
.. attribute:: kevent.filter
310310

311-
Name of the kernel filter
311+
Name of the kernel filter.
312312

313313
+---------------------------+---------------------------------------------+
314314
| Constant | Meaning |
@@ -317,7 +317,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
317317
| | there is data available to read |
318318
+---------------------------+---------------------------------------------+
319319
| :const:`KQ_FILTER_WRITE` | Takes a descriptor and returns whenever |
320-
| | there is data available to read |
320+
| | there is data available to write |
321321
+---------------------------+---------------------------------------------+
322322
| :const:`KQ_FILTER_AIO` | AIO requests |
323323
+---------------------------+---------------------------------------------+
@@ -337,7 +337,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
337337

338338
.. attribute:: kevent.flags
339339

340-
Filter action
340+
Filter action.
341341

342342
+---------------------------+---------------------------------------------+
343343
| Constant | Meaning |
@@ -366,19 +366,17 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
366366

367367
.. attribute:: kevent.fflags
368368

369-
Filter specific flags
370-
369+
Filter specific flags.
371370

372-
:const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags
371+
:const:`KQ_FILTER_READ` and :const:`KQ_FILTER_WRITE` filter flags:
373372

374373
+----------------------------+--------------------------------------------+
375374
| Constant | Meaning |
376375
+============================+============================================+
377376
| :const:`KQ_NOTE_LOWAT` | low water mark of a socket buffer |
378377
+----------------------------+--------------------------------------------+
379378

380-
381-
:const:`KQ_FILTER_VNODE` filter flags
379+
:const:`KQ_FILTER_VNODE` filter flags:
382380

383381
+----------------------------+--------------------------------------------+
384382
| Constant | Meaning |
@@ -398,8 +396,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
398396
| :const:`KQ_NOTE_REVOKE` | access to the file was revoked |
399397
+----------------------------+--------------------------------------------+
400398

401-
402-
:const:`KQ_FILTER_PROC` filter flags
399+
:const:`KQ_FILTER_PROC` filter flags:
403400

404401
+----------------------------+--------------------------------------------+
405402
| Constant | Meaning |
@@ -422,7 +419,7 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
422419
| :const:`KQ_NOTE_TRACKERR` | unable to attach to a child |
423420
+----------------------------+--------------------------------------------+
424421

425-
:const:`KQ_FILTER_NETDEV` filter flags [not available on Mac OS X]
422+
:const:`KQ_FILTER_NETDEV` filter flags (not available on Mac OS X):
426423

427424
+----------------------------+--------------------------------------------+
428425
| Constant | Meaning |
@@ -437,9 +434,9 @@ http://www.freebsd.org/cgi/man.cgi?query=kqueue&sektion=2
437434

438435
.. attribute:: kevent.data
439436

440-
Filter specific data
437+
Filter specific data.
441438

442439

443440
.. attribute:: kevent.udata
444441

445-
User defined value
442+
User defined value.

0 commit comments

Comments
 (0)