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

Skip to content

Commit 711ed4a

Browse files
committed
Merged revisions 73930-73932,73937-73939,73945,73951,73954,73962-73963,73970 via svnmerge from
svn+ssh://[email protected]/python/trunk ........ r73930 | amaury.forgeotdarc | 2009-07-10 12:47:42 -0400 (Fri, 10 Jul 2009) | 2 lines #6447: typo in subprocess docstring ........ r73931 | ezio.melotti | 2009-07-10 16:25:56 -0400 (Fri, 10 Jul 2009) | 1 line more cleanups and if zlib -> skipUnless(zlib) ........ r73932 | kristjan.jonsson | 2009-07-11 04:44:43 -0400 (Sat, 11 Jul 2009) | 3 lines http://bugs.python.org/issue6460 Need to be careful with thread switching when testing the xmlrpc server. The server thread may not have updated stats when the client thread tests them. ........ r73937 | georg.brandl | 2009-07-11 06:12:36 -0400 (Sat, 11 Jul 2009) | 1 line Fix style. ........ r73938 | georg.brandl | 2009-07-11 06:14:54 -0400 (Sat, 11 Jul 2009) | 1 line #6446: fix import_spam() function to use correct error and reference handling. ........ r73939 | georg.brandl | 2009-07-11 06:18:10 -0400 (Sat, 11 Jul 2009) | 1 line #6448: clarify docs for find_module(). ........ r73945 | georg.brandl | 2009-07-11 06:51:31 -0400 (Sat, 11 Jul 2009) | 1 line #6456: clarify the meaning of constants used as arguments to nl_langinfo(). ........ r73951 | georg.brandl | 2009-07-11 10:23:38 -0400 (Sat, 11 Jul 2009) | 2 lines array.array is actually a class. ........ r73954 | tarek.ziade | 2009-07-11 13:21:00 -0400 (Sat, 11 Jul 2009) | 1 line reverted changes for #6459 (doesn't apply on 2.x) ........ r73962 | benjamin.peterson | 2009-07-11 18:15:13 -0400 (Sat, 11 Jul 2009) | 1 line put downloaded test support files in Lib/test/data instead of the cwd ........ r73963 | benjamin.peterson | 2009-07-11 18:25:24 -0400 (Sat, 11 Jul 2009) | 1 line ignore things in Lib/test/data/ ........ r73970 | hirokazu.yamamoto | 2009-07-11 22:04:47 -0400 (Sat, 11 Jul 2009) | 1 line Fixed distutils test. ........
1 parent ea3714e commit 711ed4a

10 files changed

Lines changed: 148 additions & 192 deletions

File tree

.bzrignore

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,7 @@ platform
1414
pyconfig.h
1515
libpython*.a
1616
python.exe
17-
CP936.TXT
18-
SHIFT_JISX0213.TXT
19-
JOHAB.TXT
20-
EUC-JP.TXT
21-
NormalizationTest-3.2.0.txt
22-
NormalizationTest.txt
23-
BIG5.TXT
24-
BIG5HKSCS-2004.TXT
25-
CP949.TXT
26-
EUC-CN.TXT
27-
BIG5HKSCS.TXT
28-
SHIFTJIS.TXT
29-
EUC-KR.TXT
30-
EUC-JISX0213.TXT
31-
CP932.TXT
32-
CP950.TXT
3317
reflog.txt
34-
gb-18030-2000.xml
3518
tags
3619
TAGS
3720
.gdb_history
@@ -45,5 +28,6 @@ Modules/Setup.config
4528
Modules/Setup.local
4629
Modules/config.c
4730
Parser/pgen
31+
Lib/test/data/*
4832
Lib/lib2to3/Grammar*.pickle
4933
Lib/lib2to3/PatternGrammar*.pickle

.hgignore

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
.gdb_history
22
.purify
33
.svn
4-
BIG5.TXT
5-
BIG5HKSCS-2004.TXT
6-
BIG5HKSCS.TXT
7-
CP932.TXT
8-
CP936.TXT
9-
CP949.TXT
10-
CP950.TXT
11-
EUC-CN.TXT
12-
EUC-JISX0213.TXT
13-
EUC-JP.TXT
14-
EUC-KR.TXT
15-
JOHAB.TXT
164
Makefile
175
Makefile.pre
18-
NormalizationTest-3.2.0.txt
19-
NormalizationTest.txt
20-
SHIFTJIS.TXT
21-
SHIFT_JISX0213.TXT
226
TAGS
237
autom4te.cache
248
build
@@ -28,7 +12,6 @@ config.log
2812
config.status
2913
config.status.lineno
3014
db_home
31-
gb-18030-2000.xml
3215
platform
3316
pyconfig.h
3417
python
@@ -59,6 +42,7 @@ libpython*.a
5942
*.rej
6043
*~
6144
Lib/lib2to3/*.pickle
45+
Lib/test/data/*
6246
PCbuild/*.exe
6347
PCbuild/*.dll
6448
PCbuild/*.pdb

Doc/c-api/import.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Importing Modules
2525
imported module, or *NULL* with an exception set on failure. A failing
2626
import of a module doesn't leave the module in :data:`sys.modules`.
2727

28+
This function always uses absolute imports.
29+
2830

2931
.. cfunction:: PyObject* PyImport_ImportModuleNoBlock(const char *name)
3032

@@ -75,6 +77,8 @@ Importing Modules
7577
current globals. This means that the import is done using whatever import
7678
hooks are installed in the current environment.
7779

80+
This function always uses absolute imports.
81+
7882

7983
.. cfunction:: PyObject* PyImport_ReloadModule(PyObject *m)
8084

Doc/library/array.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ through the :attr:`itemsize` attribute.
5252
The module defines the following type:
5353

5454

55-
.. function:: array(typecode[, initializer])
55+
.. class:: array(typecode[, initializer])
5656

57-
Return a new array whose items are restricted by *typecode*, and initialized
57+
A new array whose items are restricted by *typecode*, and initialized
5858
from the optional *initializer* value, which must be a list, object
5959
supporting the buffer interface, or iterable over elements of the
6060
appropriate type.
@@ -67,7 +67,7 @@ The module defines the following type:
6767

6868
.. data:: ArrayType
6969

70-
Obsolete alias for :func:`array`.
70+
Obsolete alias for :class:`array`.
7171

7272
.. data:: typecodes
7373

@@ -81,7 +81,6 @@ and may be used wherever buffer objects are supported.
8181

8282
The following data items and methods are also supported:
8383

84-
8584
.. attribute:: array.typecode
8685

8786
The typecode character used to create the array.

Doc/library/imp.rst

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,17 @@ This module provides an interface to the mechanisms used to implement the
3333

3434
.. function:: find_module(name[, path])
3535

36-
Try to find the module *name* on the search path *path*. If *path* is a list
37-
of directory names, each directory is searched for files with any of the
38-
suffixes returned by :func:`get_suffixes` above. Invalid names in the list
39-
are silently ignored (but all list items must be strings). If *path* is
40-
omitted or ``None``, the list of directory names given by ``sys.path`` is
41-
searched, but first it searches a few special places: it tries to find a
42-
built-in module with the given name (:const:`C_BUILTIN`), then a frozen
43-
module (:const:`PY_FROZEN`), and on some systems some other places are looked
44-
in as well (on Windows, it looks in the registry which may point to a
45-
specific file).
36+
Try to find the module *name*. If *path* is omitted or ``None``, the list of
37+
directory names given by ``sys.path`` is searched, but first a few special
38+
places are searched: the function tries to find a built-in module with the
39+
given name (:const:`C_BUILTIN`), then a frozen module (:const:`PY_FROZEN`),
40+
and on some systems some other places are looked in as well (on Windows, it
41+
looks in the registry which may point to a specific file).
42+
43+
Otherwise, *path* must be a list of directory names; each directory is
44+
searched for files with any of the suffixes returned by :func:`get_suffixes`
45+
above. Invalid names in the list are silently ignored (but all list items
46+
must be strings).
4647

4748
If search is successful, the return value is a 3-element tuple ``(file,
4849
pathname, description)``:

0 commit comments

Comments
 (0)