Mailman 3 May 2006 - Python-checkins

buildbot warnings in alpha Debian 2.4
by buildbot＠python.org May 1, 2006

May 1, 2006

The Buildbot has detected a new failure of alpha Debian 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Debian%25202.4/builds/12 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r45810 - in python/trunk/Doc: Makefile.deps lib/lib.tex lib/libsqlite3.tex
by gerhard.haering May 1, 2006

May 1, 2006

Author: gerhard.haering Date: Sun Apr 30 01:12:41 2006 New Revision: 45810 Added: python/trunk/Doc/lib/libsqlite3.tex Modified: python/trunk/Doc/Makefile.deps python/trunk/Doc/lib/lib.tex Log: This is the start of documentation for the sqlite3 module. Please feel free to find a better place for the link to it than alongside bsddb & friends. Modified: python/trunk/Doc/Makefile.deps ============================================================================== --- python/trunk/Doc/Makefile.deps (original) +++ python/trunk/Doc/Makefile.deps Sun Apr 30 01:12:41 2006 @@ -350,7 +350,8 @@ lib/libturtle.tex \ lib/libtarfile.tex \ lib/libcsv.tex \ - lib/libcfgparser.tex + lib/libcfgparser.tex \ + lib/libsqlite3.tex # LaTeX source files for Macintosh Library Modules. MACFILES= $(HOWTOSTYLES) $(INDEXSTYLES) $(COMMONTEX) \ Modified: python/trunk/Doc/lib/lib.tex ============================================================================== --- python/trunk/Doc/lib/lib.tex (original) +++ python/trunk/Doc/lib/lib.tex Sun Apr 30 01:12:41 2006 @@ -224,6 +224,7 @@ \input{libdbhash} \input{libbsddb} \input{libdumbdbm} +\input{libsqlite3} % ============= Added: python/trunk/Doc/lib/libsqlite3.tex ============================================================================== --- (empty file) +++ python/trunk/Doc/lib/libsqlite3.tex Sun Apr 30 01:12:41 2006 @@ -0,0 +1,105 @@ +\section{\module{sqlite3} --- + DB-API 2.0 interface for SQLite databases} + +\declaremodule{builtin}{sqlite3} +\modulesynopsis{A DB-API 2.0 interface based on SQLite 3.x.} + + + +The module defines the following: + +\begin{datadesc}{PARSE_DECLTYPES} +This constant is meant to be used with the detect_types parameter of the connect function. + +Setting it makes the sqlite3 module parse the declared type for each column it +returns. It will parse out the first word of the declared type, i. e. for +"integer primary key", it will parse out "integer". Then for that column, it +will look into pysqlite's converters dictionary and use the converter function +registered for that type there. Converter names are case-sensitive! +\end{datadesc} + + +\begin{datadesc}{PARSE_COLNAMES} + +Setting this makes pysqlite parse the column name for each column it returns. +It will look for a string formed [mytype] in there, and then decide that +'mytype' is the type of the column. It will try to find an entry of 'mytype' in +the converters dictionary and then use the converter function found there to +return the value. The column name found in cursor.description is only the first +word of the column name, i. e. if you use something like 'as "x [datetime]"' +in your SQL, then pysqlite will parse out everything until the first blank for +the column name: the column name would simply be "x". +\end{datadesc} + +\begin{funcdesc}{connect}{database\optional{, timeout, isolation_level, detect_types, check_same_thread, factory}} +Opens a connection to the SQLite database file \var{database}. You can use +\code{":memory:"} to open a database connection to a database that resides in +RAM instead of on disk. + +When a database is accessed by multiple connections, and one of the processes +modifies the database, the SQLite database is locked until that transaction is +committed. The \var{timeout} parameter specifies how long the connection should +wait for the lock to go away until raising an exception. The default for the +timeout parameter is 5.0 (five seconds). + +For the \var{isolation_level} parameter, please see TODO: link property of +Connection objects. + +SQLite natively supports only the types TEXT, INTEGER, FLOAT, BLOB and NULL. If +you want to use other types, like you have to add support for them yourself. +The \var{detect_types} parameter and the using custom *converters* registered with +the module-level *register_converter* function allow you to easily do that. + +\var{detect_types} defaults to 0 (i. e. off, no type detection), you can set it +to any combination of *PARSE_DECLTYPES* and *PARSE_COLNAMES* to turn type +detection on. + +By default, the sqlite3 module uses its Connection class for the connect call. +You can, however, subclass the Connection class and make .connect() use your +class instead by providing your class for the \var{factory} parameter. + +Consult the section `4. SQLite and Python types`_ of this manual for details. + +The sqlite3 module internally uses a statement cache to avoid SQL parsing +overhead. If you want to explicitly set the number of statements that are +cached for the connection, you can set the \var{cached_statements} parameter. +The currently implemented default is to cache 100 statements. +\end{funcdesc} + +\begin{funcdesc}{register_converter}{typename, callable} + +Registers a callable to convert a bytestring from the database into a custom +Python type. The callable will be invoked for all database values that are of +the type \var{typename}. Confer the parameter **detect_types** of the +**connect** method for how the type detection works. Note that the case of +\var{typename} and the name of the type in your query must match! +\end{funcdesc} + +\begin{funcdesc}{register_adapter}{type, callable} +Registers a callable to convert the custom Python type \var{type} into one of +SQLite's supported types. The callable \var{callable} accepts as single +parameter the Python value, and must return a value of the following types: +int, long, float, str (UTF-8 encoded), unicode or buffer. +\end{funcdesc} + + + + + + +\subsection{Connection Objects \label{Connection-Objects}} + +A \class{Connection} instance has the following attributes and methods: + +\member{isolation_level} + Get or set the current isolation level. None for autocommit mode or one + of "DEFERRED", "IMMEDIATE" or "EXLUSIVE". See `5. Controlling + Transactions`_ for a more detailed explanation. + +\begin{methoddesc}{cursor}{\optional{cursorClass}} + The cursor method accepts a single optional parameter \var{cursorClass}. + This is a custom cursor class which must extend sqlite3.Cursor. +\end{methoddesc} + +TODO: execute* +

3 2

r45834 - in python/branches/release24-maint: Misc/NEWS Modules/_tkinter.c
by martin.v.loewis May 1, 2006

May 1, 2006

Author: martin.v.loewis Date: Mon May 1 08:29:06 2006 New Revision: 45834 Modified: python/branches/release24-maint/Misc/NEWS python/branches/release24-maint/Modules/_tkinter.c Log: Work around deadlock risk. Modified: python/branches/release24-maint/Misc/NEWS ============================================================================== --- python/branches/release24-maint/Misc/NEWS (original) +++ python/branches/release24-maint/Misc/NEWS Mon May 1 08:29:06 2006 @@ -15,6 +15,9 @@ Extension Modules ----------------- +- Calling Tk_Init twice is refused if the first call failed as that + may deadlock. + - Patch #1191065: Fix preprocessor problems on systems where recvfrom is a macro. Modified: python/branches/release24-maint/Modules/_tkinter.c ============================================================================== --- python/branches/release24-maint/Modules/_tkinter.c (original) +++ python/branches/release24-maint/Modules/_tkinter.c Mon May 1 08:29:06 2006 @@ -2609,20 +2609,32 @@ static PyObject * Tkapp_TkInit(PyObject *self, PyObject *args) { + static int has_failed; Tcl_Interp *interp = Tkapp_Interp(self); Tk_Window main_window; const char * _tk_exists = NULL; - PyObject *res = NULL; int err; main_window = Tk_MainWindow(interp); + /* In all current versions of Tk (including 8.4.13), Tk_Init + deadlocks on the second call when the first call failed. + To avoid the deadlock, we just refuse the second call through + a static variable. */ + if (has_failed) { + PyErr_SetString(Tkinter_TclError, + "Calling Tk_Init again after a previous call failed might deadlock"); + return NULL; + } + /* We want to guard against calling Tk_Init() multiple times */ CHECK_TCL_APPARTMENT; ENTER_TCL err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version"); ENTER_OVERLAP if (err == TCL_ERROR) { - res = Tkinter_Error(self); + /* This sets an exception, but we cannot return right + away because we need to exit the overlap first. */ + Tkinter_Error(self); } else { _tk_exists = Tkapp_Result(self); } @@ -2633,6 +2645,7 @@ if (_tk_exists == NULL || strcmp(_tk_exists, "1") != 0) { if (Tk_Init(interp) == TCL_ERROR) { PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self))); + has_failed = 1; return NULL; } }

1 0

r45833 - in python/trunk: Misc/NEWS Modules/_tkinter.c
by martin.v.loewis May 1, 2006

May 1, 2006

Author: martin.v.loewis Date: Mon May 1 08:28:01 2006 New Revision: 45833 Modified: python/trunk/Misc/NEWS python/trunk/Modules/_tkinter.c Log: Work around deadlock risk. Will backport. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon May 1 08:28:01 2006 @@ -63,6 +63,9 @@ Extension Modules ----------------- +- Calling Tk_Init twice is refused if the first call failed as that + may deadlock. + - Patch #1191065: Fix preprocessor problems on systems where recvfrom is a macro. Modified: python/trunk/Modules/_tkinter.c ============================================================================== --- python/trunk/Modules/_tkinter.c (original) +++ python/trunk/Modules/_tkinter.c Mon May 1 08:28:01 2006 @@ -2619,21 +2619,32 @@ static PyObject * Tkapp_TkInit(PyObject *self, PyObject *args) { + static int has_failed; Tcl_Interp *interp = Tkapp_Interp(self); Tk_Window main_window; const char * _tk_exists = NULL; - PyObject *res = NULL; int err; main_window = Tk_MainWindow(interp); + /* In all current versions of Tk (including 8.4.13), Tk_Init + deadlocks on the second call when the first call failed. + To avoid the deadlock, we just refuse the second call through + a static variable. */ + if (has_failed) { + PyErr_SetString(Tkinter_TclError, + "Calling Tk_Init again after a previous call failed might deadlock"); + return NULL; + } + /* We want to guard against calling Tk_Init() multiple times */ CHECK_TCL_APPARTMENT; ENTER_TCL err = Tcl_Eval(Tkapp_Interp(self), "info exists tk_version"); ENTER_OVERLAP if (err == TCL_ERROR) { - /* XXX: shouldn't we do something with res? */ - res = Tkinter_Error(self); + /* This sets an exception, but we cannot return right + away because we need to exit the overlap first. */ + Tkinter_Error(self); } else { _tk_exists = Tkapp_Result(self); } @@ -2644,6 +2655,7 @@ if (_tk_exists == NULL || strcmp(_tk_exists, "1") != 0) { if (Tk_Init(interp) == TCL_ERROR) { PyErr_SetString(Tkinter_TclError, Tcl_GetStringResult(Tkapp_Interp(self))); + has_failed = 1; return NULL; } }

1 0

r45832 - python/trunk/Doc/lib/libsqlite3.tex
by fred.drake May 1, 2006

May 1, 2006

Author: fred.drake Date: Mon May 1 08:25:58 2006 New Revision: 45832 Modified: python/trunk/Doc/lib/libsqlite3.tex Log: - minor clarification in section title - markup adjustments (there is clearly much to be done in this section) Modified: python/trunk/Doc/lib/libsqlite3.tex ============================================================================== --- python/trunk/Doc/lib/libsqlite3.tex (original) +++ python/trunk/Doc/lib/libsqlite3.tex Mon May 1 08:25:58 2006 @@ -2,7 +2,7 @@ DB-API 2.0 interface for SQLite databases} \declaremodule{builtin}{sqlite3} -\modulesynopsis{A DB-API 2.0 interface based on SQLite 3.x.} +\modulesynopsis{A DB-API 2.0 implementation using SQLite 3.x.} @@ -20,7 +20,6 @@ \begin{datadesc}{PARSE_COLNAMES} - Setting this makes pysqlite parse the column name for each column it returns. It will look for a string formed [mytype] in there, and then decide that 'mytype' is the type of the column. It will try to find an entry of 'mytype' in @@ -67,7 +66,6 @@ \end{funcdesc} \begin{funcdesc}{register_converter}{typename, callable} - Registers a callable to convert a bytestring from the database into a custom Python type. The callable will be invoked for all database values that are of the type \var{typename}. Confer the parameter **detect_types** of the @@ -83,23 +81,19 @@ \end{funcdesc} - - - - -\subsection{Connection Objects \label{Connection-Objects}} +\subsection{Connection Objects \label{sqlite3-Connection-Objects}} A \class{Connection} instance has the following attributes and methods: -\member{isolation_level} - Get or set the current isolation level. None for autocommit mode or one - of "DEFERRED", "IMMEDIATE" or "EXLUSIVE". See `5. Controlling - Transactions`_ for a more detailed explanation. +\begin{memberdesc}{isolation_level} + Get or set the current isolation level. None for autocommit mode or one + of "DEFERRED", "IMMEDIATE" or "EXLUSIVE". See `5. Controlling + Transactions`_ for a more detailed explanation. +\end{memberdesc} \begin{methoddesc}{cursor}{\optional{cursorClass}} - The cursor method accepts a single optional parameter \var{cursorClass}. - This is a custom cursor class which must extend sqlite3.Cursor. + The cursor method accepts a single optional parameter \var{cursorClass}. + This is a custom cursor class which must extend \class{sqlite3.Cursor}. \end{methoddesc} TODO: execute* -

1 0

buildbot warnings in alpha Tru64 5.1 trunk
by buildbot＠python.org May 1, 2006

May 1, 2006

The Buildbot has detected a new failure of alpha Tru64 5.1 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Tru64%25205.1%2520trunk/bu… Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: barry.warsaw Build Had Warnings: warnings test sincerely, -The Buildbot

1 0

r45831 - in python/branches/release23-maint/Lib: email/_parseaddr.py email/test/test_email.py rfc822.py test/test_rfc822.py
by barry.warsaw May 1, 2006

May 1, 2006

Author: barry.warsaw Date: Mon May 1 05:21:25 2006 New Revision: 45831 Modified: python/branches/release23-maint/Lib/email/_parseaddr.py python/branches/release23-maint/Lib/email/test/test_email.py python/branches/release23-maint/Lib/rfc822.py python/branches/release23-maint/Lib/test/test_rfc822.py Log: Back port from 2.4 branch: Patch #1464708 from William McVey: fixed handling of nested comments in mail addresses. E.g. "Foo ((Foo Bar)) <foo(a)example.com>" Fixes for both rfc822.py and email package. Modified: python/branches/release23-maint/Lib/email/_parseaddr.py ============================================================================== --- python/branches/release23-maint/Lib/email/_parseaddr.py (original) +++ python/branches/release23-maint/Lib/email/_parseaddr.py Mon May 1 05:21:25 2006 @@ -365,6 +365,7 @@ break elif allowcomments and self.field[self.pos] == '(': slist.append(self.getcomment()) + continue # have already advanced pos from getcomment elif self.field[self.pos] == '\\': quote = True else: Modified: python/branches/release23-maint/Lib/email/test/test_email.py ============================================================================== --- python/branches/release23-maint/Lib/email/test/test_email.py (original) +++ python/branches/release23-maint/Lib/email/test/test_email.py Mon May 1 05:21:25 2006 @@ -2064,6 +2064,12 @@ ['foo: ;', '"Jason R. Mastaler" <jason(a)dom.ain>']), [('', ''), ('Jason R. Mastaler', 'jason(a)dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = Utils.getaddresses(['User ((nested comment)) <foo(a)bar.com>']) + eq(addrs[0][1], 'foo(a)bar.com') + def test_utils_quote_unquote(self): eq = self.assertEqual msg = Message() Modified: python/branches/release23-maint/Lib/rfc822.py ============================================================================== --- python/branches/release23-maint/Lib/rfc822.py (original) +++ python/branches/release23-maint/Lib/rfc822.py Mon May 1 05:21:25 2006 @@ -712,6 +712,7 @@ break elif allowcomments and self.field[self.pos] == '(': slist.append(self.getcomment()) + continue # have already advanced pos from getcomment elif self.field[self.pos] == '\\': quote = 1 else: Modified: python/branches/release23-maint/Lib/test/test_rfc822.py ============================================================================== --- python/branches/release23-maint/Lib/test/test_rfc822.py (original) +++ python/branches/release23-maint/Lib/test/test_rfc822.py Mon May 1 05:21:25 2006 @@ -45,6 +45,10 @@ print 'extra parsed address:', repr(n), repr(a) continue i = i + 1 + self.assertEqual(mn, n, + "Un-expected name: %s != %s" % (`mn`, `n`)) + self.assertEqual(ma, a, + "Un-expected address: %s != %s" % (`ma`, `a`)) if mn == n and ma == a: pass else: @@ -129,6 +133,12 @@ 'To: person(a)dom.ain (User J. Person)\n\n', [('User J. Person', 'person(a)dom.ain')]) + def test_doublecomment(self): + # The RFC allows comments within comments in an email addr + self.check( + 'To: person(a)dom.ain ((User J. Person)), John Doe <foo(a)bar.com>\n\n', + [('User J. Person', 'person(a)dom.ain'), ('John Doe', 'foo(a)bar.com')]) + def test_twisted(self): # This one is just twisted. I don't know what the proper # result should be, but it shouldn't be to infloop, which is

1 0

r45830 - in python/trunk/Lib: email/_parseaddr.py email/test/test_email.py email/test/test_email_renamed.py rfc822.py test/test_rfc822.py
by barry.warsaw May 1, 2006

May 1, 2006

Author: barry.warsaw Date: Mon May 1 05:03:02 2006 New Revision: 45830 Modified: python/trunk/Lib/email/_parseaddr.py python/trunk/Lib/email/test/test_email.py python/trunk/Lib/email/test/test_email_renamed.py python/trunk/Lib/rfc822.py python/trunk/Lib/test/test_rfc822.py Log: Port forward from 2.4 branch: Patch #1464708 from William McVey: fixed handling of nested comments in mail addresses. E.g. "Foo ((Foo Bar)) <foo(a)example.com>" Fixes for both rfc822.py and email package. This patch needs to be back ported to Python 2.3 for email 2.5. Modified: python/trunk/Lib/email/_parseaddr.py ============================================================================== --- python/trunk/Lib/email/_parseaddr.py (original) +++ python/trunk/Lib/email/_parseaddr.py Mon May 1 05:03:02 2006 @@ -367,6 +367,7 @@ break elif allowcomments and self.field[self.pos] == '(': slist.append(self.getcomment()) + continue # have already advanced pos from getcomment elif self.field[self.pos] == '\\': quote = True else: Modified: python/trunk/Lib/email/test/test_email.py ============================================================================== --- python/trunk/Lib/email/test/test_email.py (original) +++ python/trunk/Lib/email/test/test_email.py Mon May 1 05:03:02 2006 @@ -2215,6 +2215,12 @@ ['foo: ;', '"Jason R. Mastaler" <jason(a)dom.ain>']), [('', ''), ('Jason R. Mastaler', 'jason(a)dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = Utils.getaddresses(['User ((nested comment)) <foo(a)bar.com>']) + eq(addrs[0][1], 'foo(a)bar.com') + def test_utils_quote_unquote(self): eq = self.assertEqual msg = Message() Modified: python/trunk/Lib/email/test/test_email_renamed.py ============================================================================== --- python/trunk/Lib/email/test/test_email_renamed.py (original) +++ python/trunk/Lib/email/test/test_email_renamed.py Mon May 1 05:03:02 2006 @@ -2221,6 +2221,12 @@ ['foo: ;', '"Jason R. Mastaler" <jason(a)dom.ain>']), [('', ''), ('Jason R. Mastaler', 'jason(a)dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = utils.getaddresses(['User ((nested comment)) <foo(a)bar.com>']) + eq(addrs[0][1], 'foo(a)bar.com') + def test_utils_quote_unquote(self): eq = self.assertEqual msg = Message() Modified: python/trunk/Lib/rfc822.py ============================================================================== --- python/trunk/Lib/rfc822.py (original) +++ python/trunk/Lib/rfc822.py Mon May 1 05:03:02 2006 @@ -700,6 +700,7 @@ break elif allowcomments and self.field[self.pos] == '(': slist.append(self.getcomment()) + continue # have already advanced pos from getcomment elif self.field[self.pos] == '\\': quote = 1 else: Modified: python/trunk/Lib/test/test_rfc822.py ============================================================================== --- python/trunk/Lib/test/test_rfc822.py (original) +++ python/trunk/Lib/test/test_rfc822.py Mon May 1 05:03:02 2006 @@ -45,6 +45,10 @@ print 'extra parsed address:', repr(n), repr(a) continue i = i + 1 + self.assertEqual(mn, n, + "Un-expected name: %s != %s" % (`mn`, `n`)) + self.assertEqual(ma, a, + "Un-expected address: %s != %s" % (`ma`, `a`)) if mn == n and ma == a: pass else: @@ -129,6 +133,12 @@ 'To: person(a)dom.ain (User J. Person)\n\n', [('User J. Person', 'person(a)dom.ain')]) + def test_doublecomment(self): + # The RFC allows comments within comments in an email addr + self.check( + 'To: person(a)dom.ain ((User J. Person)), John Doe <foo(a)bar.com>\n\n', + [('User J. Person', 'person(a)dom.ain'), ('John Doe', 'foo(a)bar.com')]) + def test_twisted(self): # This one is just twisted. I don't know what the proper # result should be, but it shouldn't be to infloop, which is

1 0