Skip to content

Commit 7eaf822

Browse files
gvanrossumgvanrossum
committed
Merged revisions 55962-56019 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55985 | neal.norwitz | 2007-06-14 20:14:38 -0700 (Thu, 14 Jun 2007) | 2 lines All these tests have been flaky wrt reporting leaks. Disable them. ................ r56003 | neal.norwitz | 2007-06-15 19:41:09 -0700 (Fri, 15 Jun 2007) | 1 line Fix typo (certain). ................ r56004 | neal.norwitz | 2007-06-15 20:54:18 -0700 (Fri, 15 Jun 2007) | 4 lines Fix it so test_os no longer reports ref leaks by clearing all the caches the ABCMeta stores on the class. Apply this to all the ABC collections as well as the class of os.environ which inherits from an ABC collection. ................ r56013 | neal.norwitz | 2007-06-17 19:56:31 -0700 (Sun, 17 Jun 2007) | 4 lines This should make it a little easier when adding new collections which use ABCs. The new subclass won't need to be listed in regrtest. It will be even better when Guido adds weakrefs. :-) ................ r56014 | martin.v.loewis | 2007-06-17 20:15:51 -0700 (Sun, 17 Jun 2007) | 1 line Drop inline, as it's not support by VS 2003. ................ r56015 | martin.v.loewis | 2007-06-17 20:17:19 -0700 (Sun, 17 Jun 2007) | 1 line Expect long objects for DWORD values. ................ r56016 | martin.v.loewis | 2007-06-17 20:18:01 -0700 (Sun, 17 Jun 2007) | 1 line Drop modules that have been deleted. ................ r56017 | martin.v.loewis | 2007-06-17 20:18:55 -0700 (Sun, 17 Jun 2007) | 1 line Bump DLL version number to 30. ................ r56018 | neal.norwitz | 2007-06-17 20:55:43 -0700 (Sun, 17 Jun 2007) | 62 lines Merged revisions 55951-56013 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55956 | thomas.heller | 2007-06-13 00:07:03 -0700 (Wed, 13 Jun 2007) | 2 lines Do not hardcode the buildbot's directory name. ........ r55957 | thomas.heller | 2007-06-13 00:07:41 -0700 (Wed, 13 Jun 2007) | 2 lines Notes about building tcl/tk for windows/AMD64. ........ r55958 | thomas.heller | 2007-06-13 00:54:57 -0700 (Wed, 13 Jun 2007) | 2 lines Build bzip2. ........ r55962 | walter.doerwald | 2007-06-13 09:57:12 -0700 (Wed, 13 Jun 2007) | 8 lines Add T_PYSSIZET in structmember.h: This can be used for Py_ssize_t members. Simplify the implementation of UnicodeError objects: start and end attributes are now stored directly as Py_ssize_t members, which simplifies various get and set functions. ........ r55975 | martin.v.loewis | 2007-06-14 13:46:25 -0700 (Thu, 14 Jun 2007) | 3 lines Patch #1734014: Use _I64_MAX instead of LLONG_MAX. Will backport to 2.5. ........ r55984 | neal.norwitz | 2007-06-14 20:11:41 -0700 (Thu, 14 Jun 2007) | 4 lines urllib2_localnet says it leaks probably due to threads. So ignore it. popen2 is also complaining probably for similar reasons. make install always reports failure, so don't mail in this case. ........ r56001 | andrew.kuchling | 2007-06-15 15:43:03 -0700 (Fri, 15 Jun 2007) | 1 line Add a word ........ r56005 | martin.v.loewis | 2007-06-16 03:08:43 -0700 (Sat, 16 Jun 2007) | 2 lines Mention Senthil Kumaran. ........ r56006 | georg.brandl | 2007-06-16 10:10:12 -0700 (Sat, 16 Jun 2007) | 2 lines Add missing \versionadded. ........ r56009 | neal.norwitz | 2007-06-17 11:48:32 -0700 (Sun, 17 Jun 2007) | 1 line SF #1738670, make example in doc work ........ r56011 | neal.norwitz | 2007-06-17 19:46:36 -0700 (Sun, 17 Jun 2007) | 1 line SF #1738754, remove extra backslash in string ........ r56012 | neal.norwitz | 2007-06-17 19:50:15 -0700 (Sun, 17 Jun 2007) | 1 line Revert last change for SF #1738754, there's no print in there. ........ ................
1 parent 96ca691 commit 7eaf822

File tree

18 files changed

+198
-201
lines changed

18 files changed

+198
-201
lines changed

‎Doc/api/concrete.tex‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ \subsection{The None Object \label{noneObject}}
9999

100100
\begin{csimplemacrodesc}{Py_RETURN_NONE}
101101
Properly handle returning \cdata{Py_None} from within a C function.
102+
\versionadded{2.4}
102103
\end{csimplemacrodesc}
103104

104105

‎Doc/howto/unicode.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ it presents a number of problems.
152152
4. Many Internet standards are defined in terms of textual data, and
153153
can't handle content with embedded zero bytes.
154154

155-
Generally people don't use this encoding, choosing other encodings
155+
Generally people don't use this encoding, instead choosing other encodings
156156
that are more efficient and convenient.
157157

158158
Encodings don't have to handle every possible Unicode character, and

‎Doc/lib/libsqlite3.tex‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,12 @@ \section{\module{sqlite3} ---
4242
# Insert a row of data
4343
c.execute("""insert into stocks
4444
values ('2006-01-05','BUY','RHAT',100,35.14)""")
45+
46+
# Save (commit) the changes
47+
conn.commit()
48+
49+
# We can also close the cursor if we are done with it
50+
c.close()
4551
\end{verbatim}
4652

4753
Usually your SQL operations will need to use values from Python

‎Include/pyerrors.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ typedef struct {
3030
PyObject *args;
3131
PyObject *encoding;
3232
PyObject *object;
33-
PyObject *start;
34-
PyObject *end;
33+
Py_ssize_t start;
34+
Py_ssize_t end;
3535
PyObject *reason;
3636
} PyUnicodeErrorObject;
3737

‎Include/structmember.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ typedef struct PyMemberDef {
6868
#ifdef HAVE_LONG_LONG
6969
#define T_LONGLONG 17
7070
#define T_ULONGLONG 18
71+
#define T_PYSSIZET 19 /* Py_ssize_t */
7172
#endif /* HAVE_LONG_LONG */
7273

73-
#define T_NONE 19 /* Value is always None */
74+
#define T_NONE 20 /* Value is always None */
7475

7576
/* Flags */
7677
#define READONLY 1

‎Lib/_abcoll.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"""Abstract Base Classes (ABCs) for collections, according to PEP 3119.
55
66
DON'T USE THIS MODULE DIRECTLY! The classes here should be imported
7-
via collections; they are defined here only to alleviate ceratin
7+
via collections; they are defined here only to alleviate certain
88
bootstrapping issues. Unit tests are in test_collections.
99
"""
1010

‎Lib/test/regrtest.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ def dash_R_cleanup(fs, ps, pic):
697697
import gc, copy_reg
698698
import _strptime, linecache, dircache
699699
import urlparse, urllib, urllib2, mimetypes, doctest
700-
import struct, filecmp, collections
700+
import struct, filecmp, _abcoll
701701
from distutils.dir_util import _path_created
702702

703703
# Restore some original values.
@@ -708,8 +708,11 @@ def dash_R_cleanup(fs, ps, pic):
708708
sys.path_importer_cache.update(pic)
709709

710710
# Clear ABC registries.
711-
for obj in [collections.Hashable, collections.Iterable]:
712-
obj._ABCMeta__registry.clear()
711+
for abc in [getattr(_abcoll, a) for a in _abcoll.__all__]:
712+
for obj in abc.__subclasses__() + [abc]:
713+
obj._ABCMeta__registry.clear()
714+
obj._ABCMeta__cache.clear()
715+
obj._ABCMeta__negative_cache.clear()
713716

714717
# Clear assorted module caches.
715718
_path_created.clear()

‎Misc/build.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ REFLOG="build/reflog.txt.out"
6767
# Note: test_XXX (none currently) really leak, but are disabled
6868
# so we don't send spam. Any test which really leaks should only
6969
# be listed here if there are also test cases under Lib/test/leakers.
70-
LEAKY_TESTS="test_(cmd_line|socket)"
70+
LEAKY_TESTS="test_(cmd_line|popen2|socket|threading_local|urllib2_localnet)"
7171

7272
# These tests always fail, so skip them so we don't get false positives.
7373
_ALWAYS_SKIP=""
@@ -170,7 +170,6 @@ if [ $err = 0 -a "$BUILD_DISABLED" != "yes" ]; then
170170
start=`current_time`
171171
make install >& build/$F
172172
update_status "Installing" "$F" $start
173-
mail_on_failure "install" build/$F
174173

175174
if [ ! -x $PYTHON ]; then
176175
ln -s ${PYTHON}3.* $PYTHON

‎Misc/developers.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ the format to accommodate documentation needs as they arise.
1717
Permissions History
1818
-------------------
1919

20+
- Senthil Kumaran was given SVN access on June 16 2007
21+
by MvL, for his Summer-of-Code project, mentored by
22+
Skip Montanaro.
23+
2024
- Alexandre Vassalotti was given SVN access on May 21 2007
2125
by MvL, for his Summer-of-Code project, mentored by
2226
Brett Cannon.

0 commit comments

Comments
 (0)