From python-checkins at python.org Mon May 1 05:03:10 2006 From: python-checkins at python.org (barry.warsaw) Date: Mon, 1 May 2006 05:03:10 +0200 (CEST) Subject: [Python-checkins] 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 Message-ID: <20060501030310.767DB1E4011@bag.python.org> 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)) " 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 R. Mastaler', 'jason at dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = Utils.getaddresses(['User ((nested comment)) ']) + eq(addrs[0][1], 'foo at 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 R. Mastaler', 'jason at dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = utils.getaddresses(['User ((nested comment)) ']) + eq(addrs[0][1], 'foo at 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 at dom.ain (User J. Person)\n\n', [('User J. Person', 'person at dom.ain')]) + def test_doublecomment(self): + # The RFC allows comments within comments in an email addr + self.check( + 'To: person at dom.ain ((User J. Person)), John Doe \n\n', + [('User J. Person', 'person at dom.ain'), ('John Doe', 'foo at 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 From python-checkins at python.org Mon May 1 05:21:31 2006 From: python-checkins at python.org (barry.warsaw) Date: Mon, 1 May 2006 05:21:31 +0200 (CEST) Subject: [Python-checkins] r45831 - in python/branches/release23-maint/Lib: email/_parseaddr.py email/test/test_email.py rfc822.py test/test_rfc822.py Message-ID: <20060501032131.8E6181E4009@bag.python.org> 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)) " 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 R. Mastaler', 'jason at dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = Utils.getaddresses(['User ((nested comment)) ']) + eq(addrs[0][1], 'foo at 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 at dom.ain (User J. Person)\n\n', [('User J. Person', 'person at dom.ain')]) + def test_doublecomment(self): + # The RFC allows comments within comments in an email addr + self.check( + 'To: person at dom.ain ((User J. Person)), John Doe \n\n', + [('User J. Person', 'person at dom.ain'), ('John Doe', 'foo at 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 From buildbot at python.org Mon May 1 05:51:25 2006 From: buildbot at python.org (buildbot at python.org) Date: Mon, 01 May 2006 03:51:25 +0000 Subject: [Python-checkins] buildbot warnings in alpha Tru64 5.1 trunk Message-ID: <20060501035125.836E91E400E@bag.python.org> 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/builds/395 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 From python-checkins at python.org Mon May 1 08:26:00 2006 From: python-checkins at python.org (fred.drake) Date: Mon, 1 May 2006 08:26:00 +0200 (CEST) Subject: [Python-checkins] r45832 - python/trunk/Doc/lib/libsqlite3.tex Message-ID: <20060501062600.58AD61E400E@bag.python.org> 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* - From python-checkins at python.org Mon May 1 08:28:02 2006 From: python-checkins at python.org (martin.v.loewis) Date: Mon, 1 May 2006 08:28:02 +0200 (CEST) Subject: [Python-checkins] r45833 - in python/trunk: Misc/NEWS Modules/_tkinter.c Message-ID: <20060501062802.DC0241E400E@bag.python.org> 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; } } From python-checkins at python.org Mon May 1 08:29:07 2006 From: python-checkins at python.org (martin.v.loewis) Date: Mon, 1 May 2006 08:29:07 +0200 (CEST) Subject: [Python-checkins] r45834 - in python/branches/release24-maint: Misc/NEWS Modules/_tkinter.c Message-ID: <20060501062907.D773B1E400E@bag.python.org> 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; } } From fdrake at acm.org Mon May 1 08:34:09 2006 From: fdrake at acm.org (Fred L. Drake, Jr.) Date: Mon, 1 May 2006 02:34:09 -0400 Subject: [Python-checkins] r45810 - in python/trunk/Doc: Makefile.deps lib/lib.tex lib/libsqlite3.tex In-Reply-To: References: <20060429231242.6CAEC1E400D@bag.python.org> Message-ID: <200605010234.10000.fdrake@acm.org> On Sunday 30 April 2006 01:00, Georg Brandl wrote: > > +\declaremodule{builtin}{sqlite3} > > +\modulesynopsis{A DB-API 2.0 interface based on SQLite 3.x.} > > I find that confusing -- isn't it a DB-API interface to SQLite? I've adjusted that description; hopefully that's more clear now. The state of that section of the documentation is very sad. Hopefully someone in the know can at least add a link to the original documentation in a comment at the top of that file; if there's a related issue on SF, or if one of the volunteer LaTeXifers is already on it, that would be good to note as well. In the current state, I don't know where to look for documentation on the module, or whether I should even attempt to work on it any myself. -Fred -- Fred L. Drake, Jr. From buildbot at python.org Mon May 1 11:20:15 2006 From: buildbot at python.org (buildbot at python.org) Date: Mon, 01 May 2006 09:20:15 +0000 Subject: [Python-checkins] buildbot warnings in alpha Debian 2.4 Message-ID: <20060501092015.BD8781E4012@bag.python.org> 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 From buildbot at python.org Mon May 1 11:40:49 2006 From: buildbot at python.org (buildbot at python.org) Date: Mon, 01 May 2006 09:40:49 +0000 Subject: [Python-checkins] buildbot failure in sparc Ubuntu dapper 2.4 Message-ID: <20060501094049.B177D1E4015@bag.python.org> The Buildbot has detected a new failure of sparc Ubuntu dapper 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%2520Ubuntu%2520dapper%25202.4/builds/46 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From python-checkins at python.org Mon May 1 13:18:19 2006 From: python-checkins at python.org (andrew.kuchling) Date: Mon, 1 May 2006 13:18:19 +0200 (CEST) Subject: [Python-checkins] r45835 - peps/trunk/pep-0000.txt peps/trunk/pep-0314.txt peps/trunk/pep-0356.txt Message-ID: <20060501111819.3360D1E400F@bag.python.org> Author: andrew.kuchling Date: Mon May 1 13:18:18 2006 New Revision: 45835 Modified: peps/trunk/pep-0000.txt peps/trunk/pep-0314.txt peps/trunk/pep-0356.txt Log: Mark PEP 314 as final Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Mon May 1 13:18:18 2006 @@ -86,7 +86,6 @@ I 287 reStructuredText Docstring Format Goodger S 297 Support for System Upgrades Lemburg S 302 New Import Hooks JvR, Moore - S 314 Metadata for Python Software Packages v1.1 Kuchling, Jones S 323 Copyable Iterators Martelli S 331 Locale-Independent Float/String Conversions Reis S 334 Simple Coroutines via SuspendIteration Evans @@ -155,6 +154,7 @@ SF 308 Conditional Expressions GvR, Hettinger SF 309 Partial Function Application Harris SF 311 Simplified GIL Acquisition for Extensions Hammond + SF 314 Metadata for Python Software Packages v1.1 Kuchling, Jones SF 318 Decorators for Functions and Methods Smith, et al IF 320 Python 2.4 Release Schedule Warsaw, et al SF 322 Reverse Iteration Hettinger @@ -374,7 +374,7 @@ SF 311 Simplified GIL Acquisition for Extensions Hammond SD 312 Simple Implicit Lambda Suzi, Martelli SR 313 Adding Roman Numeral Literals to Python Meyer - S 314 Metadata for Python Software Packages v1.1 Kuchling, Jones + SF 314 Metadata for Python Software Packages v1.1 Kuchling, Jones SD 315 Enhanced While Loop Carroll, Hettinger SD 316 Programming by Contract for Python Way SR 317 Eliminate Implicit Exception Instantiation Taschuk Modified: peps/trunk/pep-0314.txt ============================================================================== --- peps/trunk/pep-0314.txt (original) +++ peps/trunk/pep-0314.txt Mon May 1 13:18:18 2006 @@ -3,7 +3,7 @@ Version: $Revision$ Last-Modified: $Date$ Author: A.M. Kuchling , Richard Jones -Status: Draft +Status: Final Type: Standards Track Content-type: text/plain Created: 12-Apr-2003 Modified: peps/trunk/pep-0356.txt ============================================================================== --- peps/trunk/pep-0356.txt (original) +++ peps/trunk/pep-0356.txt Mon May 1 13:18:18 2006 @@ -52,7 +52,6 @@ PEP 308: Conditional Expressions PEP 309: Partial Function Application PEP 314: Metadata for Python Software Packages v1.1 - (should PEP 314 be marked final?) PEP 328: Absolute/Relative Imports PEP 338: Executing Modules as Scripts PEP 341: Unified try-except/try-finally to try-except-finally From python-checkins at python.org Mon May 1 14:45:03 2006 From: python-checkins at python.org (andrew.kuchling) Date: Mon, 1 May 2006 14:45:03 +0200 (CEST) Subject: [Python-checkins] r45836 - python/trunk/Doc/whatsnew/whatsnew25.tex Message-ID: <20060501124503.A0FBC1E400F@bag.python.org> Author: andrew.kuchling Date: Mon May 1 14:45:02 2006 New Revision: 45836 Modified: python/trunk/Doc/whatsnew/whatsnew25.tex Log: Some ElementTree fixes: import from xml, not xmlcore; fix case of module name; mention list() instead of getchildren() Modified: python/trunk/Doc/whatsnew/whatsnew25.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew25.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew25.tex Mon May 1 14:45:02 2006 @@ -1633,7 +1633,7 @@ \subsection{The ElementTree package\label{module-etree}} A subset of Fredrik Lundh's ElementTree library for processing XML has -been added to the standard library as \module{xmlcore.etree}. The +been added to the standard library as \module{xml.etree}. The available modules are \module{ElementTree}, \module{ElementPath}, and \module{ElementInclude} from ElementTree 1.2.6. @@ -1655,7 +1655,7 @@ object and returns an \class{ElementTree} instance: \begin{verbatim} -from xmlcore.etree import ElementTree as ET +from xml.etree import ElementTree as ET tree = ET.parse('ex-1.xml') @@ -1673,7 +1673,7 @@ approaching the convenience of an XML literal: \begin{verbatim} -svg = et.XML("""

-hello from <main.Tag instance at 0x402ce8ec> -

-\end{verbatim} \end{funcdesc} \begin{funcdesc}{nested}{ctx1\optional{, ctx2\optional{, ...}}} @@ -147,25 +119,6 @@ without needing to explicitly close \code{page}. Even if an error occurs, \code{page.close()} will be called when the \keyword{with} block is exited. - -Context managers with a close method can use this context factory -to easily implement their own \method{__context__()} method. -\begin{verbatim} -from __future__ import with_statement -from contextlib import closing - -class MyClass: - def close(self): - print "Closing", self - def __context__(self): - return closing(self) - ->>> with MyClass() as x: -... print "Hello from", x -... -Hello from <__main__.MyClass instance at 0xb7df02ec> -Closing <__main__.MyClass instance at 0xb7df02ec> -\end{verbatim} \end{funcdesc} \begin{seealso} Modified: python/trunk/Doc/ref/ref3.tex ============================================================================== --- python/trunk/Doc/ref/ref3.tex (original) +++ python/trunk/Doc/ref/ref3.tex Tue May 2 21:47:52 2006 @@ -2138,22 +2138,6 @@ see ``\ulink{Context Types}{../lib/typecontext.html}'' in the \citetitle[../lib/lib.html]{Python Library Reference}. -\begin{methoddesc}[context manager]{__context__}{self} -Invoked when the object is used as the context expression of a -\keyword{with} statement. The returned object must implement -\method{__enter__()} and \method{__exit__()} methods. - -Context managers written in Python can also implement this method -using a generator function decorated with the -\function{contextlib.contextfactory} decorator, as this can be simpler -than writing individual \method{__enter__()} and \method{__exit__()} -methods on a separate object when the state to be managed is complex. - -\keyword{with} statement context objects also need to implement this -method; they are required to return themselves (that is, this method -will simply return \var{self}). -\end{methoddesc} - \begin{methoddesc}[with statement context]{__enter__}{self} Enter the runtime context related to this object. The \keyword{with} statement will bind this method's return value to the target(s) Modified: python/trunk/Doc/ref/ref7.tex ============================================================================== --- python/trunk/Doc/ref/ref7.tex (original) +++ python/trunk/Doc/ref/ref7.tex Tue May 2 21:47:52 2006 @@ -322,21 +322,18 @@ \begin{productionlist} \production{with_stmt} - {"with" \token{expression} ["as" target_list] ":" \token{suite}} + {"with" \token{expression} ["as" target] ":" \token{suite}} \end{productionlist} The execution of the \keyword{with} statement proceeds as follows: \begin{enumerate} -\item The context expression is evaluated, to obtain a context manager. +\item The context expression is evaluated to obtain a context manager. -\item The context manger's \method{__context__()} method is -invoked to obtain a \keyword{with} statement context object. +\item The context manager's \method{__enter__()} method is invoked. -\item The context object's \method{__enter__()} method is invoked. - -\item If a target list was included in the \keyword{with} +\item If a target was included in the \keyword{with} statement, the return value from \method{__enter__()} is assigned to it. \note{The \keyword{with} statement guarantees that if the @@ -347,7 +344,7 @@ \item The suite is executed. -\item The context object's \method{__exit__()} method is invoked. If +\item The context manager's \method{__exit__()} method is invoked. If an exception caused the suite to be exited, its type, value, and traceback are passed as arguments to \method{__exit__()}. Otherwise, three \constant{None} arguments are supplied. Modified: python/trunk/Lib/calendar.py ============================================================================== --- python/trunk/Lib/calendar.py (original) +++ python/trunk/Lib/calendar.py Tue May 2 21:47:52 2006 @@ -484,9 +484,6 @@ def __init__(self, locale): self.locale = locale - def __context__(self): - return self - def __enter__(self): self.oldlocale = locale.setlocale(locale.LC_TIME, self.locale) return locale.getlocale(locale.LC_TIME)[1] Modified: python/trunk/Lib/compiler/pycodegen.py ============================================================================== --- python/trunk/Lib/compiler/pycodegen.py (original) +++ python/trunk/Lib/compiler/pycodegen.py Tue May 2 21:47:52 2006 @@ -833,8 +833,6 @@ self.__with_count += 1 self.set_lineno(node) self.visit(node.expr) - self.emit('LOAD_ATTR', '__context__') - self.emit('CALL_FUNCTION', 0) self.emit('DUP_TOP') self.emit('LOAD_ATTR', '__exit__') self._implicitNameOp('STORE', exitvar) Modified: python/trunk/Lib/contextlib.py ============================================================================== --- python/trunk/Lib/contextlib.py (original) +++ python/trunk/Lib/contextlib.py Tue May 2 21:47:52 2006 @@ -10,9 +10,6 @@ def __init__(self, gen): self.gen = gen - def __context__(self): - return self - def __enter__(self): try: return self.gen.next() @@ -88,7 +85,7 @@ @contextfactory -def nested(*contexts): +def nested(*managers): """Support multiple context managers in a single with-statement. Code like this: @@ -109,8 +106,7 @@ exc = (None, None, None) try: try: - for context in contexts: - mgr = context.__context__() + for mgr in managers: exit = mgr.__exit__ enter = mgr.__enter__ vars.append(enter()) @@ -152,8 +148,6 @@ """ def __init__(self, thing): self.thing = thing - def __context__(self): - return self def __enter__(self): return self.thing def __exit__(self, *exc_info): Modified: python/trunk/Lib/decimal.py ============================================================================== --- python/trunk/Lib/decimal.py (original) +++ python/trunk/Lib/decimal.py Tue May 2 21:47:52 2006 @@ -2248,7 +2248,7 @@ s.append('traps=[' + ', '.join([t.__name__ for t, v in self.traps.items() if v]) + ']') return ', '.join(s) + ')' - def __context__(self): + def context_manager(self): return WithStatementContext(self.copy()) def clear_flags(self): Modified: python/trunk/Lib/dummy_thread.py ============================================================================== --- python/trunk/Lib/dummy_thread.py (original) +++ python/trunk/Lib/dummy_thread.py Tue May 2 21:47:52 2006 @@ -118,9 +118,6 @@ def __exit__(self, typ, val, tb): self.release() - def __context__(self): - return self - def release(self): """Release the dummy lock.""" # XXX Perhaps shouldn't actually bother to test? Could lead Modified: python/trunk/Lib/test/test_contextlib.py ============================================================================== --- python/trunk/Lib/test/test_contextlib.py (original) +++ python/trunk/Lib/test/test_contextlib.py Tue May 2 21:47:52 2006 @@ -51,7 +51,7 @@ @contextfactory def whee(): yield - ctx = whee().__context__() + ctx = whee() ctx.__enter__() # Calling __exit__ should not result in an exception self.failIf(ctx.__exit__(TypeError, TypeError("foo"), None)) @@ -63,7 +63,7 @@ yield except: yield - ctx = whoo().__context__() + ctx = whoo() ctx.__enter__() self.assertRaises( RuntimeError, ctx.__exit__, TypeError, TypeError("foo"), None @@ -152,8 +152,6 @@ def a(): yield 1 class b(object): - def __context__(self): - return self def __enter__(self): return 2 def __exit__(self, *exc_info): @@ -341,12 +339,12 @@ orig_context = ctx.copy() try: ctx.prec = save_prec = decimal.ExtendedContext.prec + 5 - with decimal.ExtendedContext: + with decimal.ExtendedContext.context_manager(): self.assertEqual(decimal.getcontext().prec, decimal.ExtendedContext.prec) self.assertEqual(decimal.getcontext().prec, save_prec) try: - with decimal.ExtendedContext: + with decimal.ExtendedContext.context_manager(): self.assertEqual(decimal.getcontext().prec, decimal.ExtendedContext.prec) 1/0 Modified: python/trunk/Lib/test/test_with.py ============================================================================== --- python/trunk/Lib/test/test_with.py (original) +++ python/trunk/Lib/test/test_with.py Tue May 2 21:47:52 2006 @@ -17,15 +17,10 @@ class MockContextManager(GeneratorContext): def __init__(self, gen): GeneratorContext.__init__(self, gen) - self.context_called = False self.enter_called = False self.exit_called = False self.exit_args = None - def __context__(self): - self.context_called = True - return GeneratorContext.__context__(self) - def __enter__(self): self.enter_called = True return GeneratorContext.__enter__(self) @@ -60,21 +55,17 @@ class Nested(object): - def __init__(self, *contexts): - self.contexts = contexts + def __init__(self, *managers): + self.managers = managers self.entered = None - def __context__(self): - return self - def __enter__(self): if self.entered is not None: raise RuntimeError("Context is not reentrant") self.entered = deque() vars = [] try: - for context in self.contexts: - mgr = context.__context__() + for mgr in self.managers: vars.append(mgr.__enter__()) self.entered.appendleft(mgr) except: @@ -99,17 +90,12 @@ class MockNested(Nested): - def __init__(self, *contexts): - Nested.__init__(self, *contexts) - self.context_called = False + def __init__(self, *managers): + Nested.__init__(self, *managers) self.enter_called = False self.exit_called = False self.exit_args = None - def __context__(self): - self.context_called = True - return Nested.__context__(self) - def __enter__(self): self.enter_called = True return Nested.__enter__(self) @@ -126,24 +112,8 @@ with foo: pass self.assertRaises(NameError, fooNotDeclared) - def testContextAttributeError(self): - class LacksContext(object): - def __enter__(self): - pass - - def __exit__(self, type, value, traceback): - pass - - def fooLacksContext(): - foo = LacksContext() - with foo: pass - self.assertRaises(AttributeError, fooLacksContext) - def testEnterAttributeError(self): class LacksEnter(object): - def __context__(self): - pass - def __exit__(self, type, value, traceback): pass @@ -154,9 +124,6 @@ def testExitAttributeError(self): class LacksExit(object): - def __context__(self): - pass - def __enter__(self): pass @@ -192,27 +159,10 @@ 'with mock as (foo, None, bar):\n' ' pass') - def testContextThrows(self): - class ContextThrows(object): - def __context__(self): - raise RuntimeError("Context threw") - - def shouldThrow(): - ct = ContextThrows() - self.foo = None - with ct as self.foo: - pass - self.assertRaises(RuntimeError, shouldThrow) - self.assertEqual(self.foo, None) - def testEnterThrows(self): class EnterThrows(object): - def __context__(self): - return self - def __enter__(self): - raise RuntimeError("Context threw") - + raise RuntimeError("Enter threw") def __exit__(self, *args): pass @@ -226,8 +176,6 @@ def testExitThrows(self): class ExitThrows(object): - def __context__(self): - return self def __enter__(self): return def __exit__(self, *args): @@ -241,13 +189,11 @@ TEST_EXCEPTION = RuntimeError("test exception") def assertInWithManagerInvariants(self, mock_manager): - self.assertTrue(mock_manager.context_called) self.assertTrue(mock_manager.enter_called) self.assertFalse(mock_manager.exit_called) self.assertEqual(mock_manager.exit_args, None) def assertAfterWithManagerInvariants(self, mock_manager, exit_args): - self.assertTrue(mock_manager.context_called) self.assertTrue(mock_manager.enter_called) self.assertTrue(mock_manager.exit_called) self.assertEqual(mock_manager.exit_args, exit_args) @@ -268,7 +214,6 @@ raise self.TEST_EXCEPTION def assertAfterWithManagerInvariantsWithError(self, mock_manager): - self.assertTrue(mock_manager.context_called) self.assertTrue(mock_manager.enter_called) self.assertTrue(mock_manager.exit_called) self.assertEqual(mock_manager.exit_args[0], RuntimeError) @@ -472,7 +417,6 @@ # The inner statement stuff should never have been touched self.assertEqual(self.bar, None) - self.assertFalse(mock_b.context_called) self.assertFalse(mock_b.enter_called) self.assertFalse(mock_b.exit_called) self.assertEqual(mock_b.exit_args, None) @@ -506,13 +450,9 @@ self.assertRaises(StopIteration, shouldThrow) def testRaisedStopIteration2(self): - class cm (object): - def __context__(self): - return self - + class cm(object): def __enter__(self): pass - def __exit__(self, type, value, traceback): pass @@ -535,12 +475,8 @@ def testRaisedGeneratorExit2(self): class cm (object): - def __context__(self): - return self - def __enter__(self): pass - def __exit__(self, type, value, traceback): pass @@ -629,7 +565,6 @@ def testMultipleComplexTargets(self): class C: - def __context__(self): return self def __enter__(self): return 1, 2, 3 def __exit__(self, t, v, tb): pass targets = {1: [0, 1, 2]} @@ -651,7 +586,6 @@ def testExitTrueSwallowsException(self): class AfricanSwallow: - def __context__(self): return self def __enter__(self): pass def __exit__(self, t, v, tb): return True try: @@ -662,7 +596,6 @@ def testExitFalseDoesntSwallowException(self): class EuropeanSwallow: - def __context__(self): return self def __enter__(self): pass def __exit__(self, t, v, tb): return False try: Modified: python/trunk/Lib/threading.py ============================================================================== --- python/trunk/Lib/threading.py (original) +++ python/trunk/Lib/threading.py Tue May 2 21:47:52 2006 @@ -90,9 +90,6 @@ self.__owner and self.__owner.getName(), self.__count) - def __context__(self): - return self - def acquire(self, blocking=1): me = currentThread() if self.__owner is me: @@ -182,8 +179,11 @@ pass self.__waiters = [] - def __context__(self): - return self.__lock.__context__() + def __enter__(self): + return self.__lock.__enter__() + + def __exit__(self, *args): + return self.__lock.__exit__(*args) def __repr__(self): return "" % (self.__lock, len(self.__waiters)) @@ -278,9 +278,6 @@ self.__cond = Condition(Lock()) self.__value = value - def __context__(self): - return self - def acquire(self, blocking=1): rc = False self.__cond.acquire() Modified: python/trunk/Misc/Vim/syntax_test.py ============================================================================== --- python/trunk/Misc/Vim/syntax_test.py (original) +++ python/trunk/Misc/Vim/syntax_test.py Tue May 2 21:47:52 2006 @@ -19,8 +19,6 @@ def foo(): # function definition return [] class Bar(object): # Class definition - def __context__(self): - return self def __enter__(self): pass def __exit__(self, *args): Modified: python/trunk/Modules/threadmodule.c ============================================================================== --- python/trunk/Modules/threadmodule.c (original) +++ python/trunk/Modules/threadmodule.c Tue May 2 21:47:52 2006 @@ -98,13 +98,6 @@ \n\ Return whether the lock is in the locked state."); -static PyObject * -lock_context(lockobject *self) -{ - Py_INCREF(self); - return (PyObject *)self; -} - static PyMethodDef lock_methods[] = { {"acquire_lock", (PyCFunction)lock_PyThread_acquire_lock, METH_VARARGS, acquire_doc}, @@ -118,8 +111,6 @@ METH_NOARGS, locked_doc}, {"locked", (PyCFunction)lock_locked_lock, METH_NOARGS, locked_doc}, - {"__context__", (PyCFunction)lock_context, - METH_NOARGS, PyDoc_STR("__context__() -> self.")}, {"__enter__", (PyCFunction)lock_PyThread_acquire_lock, METH_VARARGS, acquire_doc}, {"__exit__", (PyCFunction)lock_PyThread_release_lock, Modified: python/trunk/Objects/fileobject.c ============================================================================== --- python/trunk/Objects/fileobject.c (original) +++ python/trunk/Objects/fileobject.c Tue May 2 21:47:52 2006 @@ -1706,9 +1706,6 @@ PyDoc_STRVAR(isatty_doc, "isatty() -> true or false. True if the file is connected to a tty device."); -PyDoc_STRVAR(context_doc, - "__context__() -> self."); - PyDoc_STRVAR(enter_doc, "__enter__() -> self."); @@ -1729,7 +1726,6 @@ {"flush", (PyCFunction)file_flush, METH_NOARGS, flush_doc}, {"close", (PyCFunction)file_close, METH_NOARGS, close_doc}, {"isatty", (PyCFunction)file_isatty, METH_NOARGS, isatty_doc}, - {"__context__", (PyCFunction)file_self, METH_NOARGS, context_doc}, {"__enter__", (PyCFunction)file_self, METH_NOARGS, enter_doc}, {"__exit__", (PyCFunction)file_close, METH_VARARGS, close_doc}, {NULL, NULL} /* sentinel */ @@ -2445,4 +2441,3 @@ #ifdef __cplusplus } #endif - Modified: python/trunk/Python/compile.c ============================================================================== --- python/trunk/Python/compile.c (original) +++ python/trunk/Python/compile.c Tue May 2 21:47:52 2006 @@ -3371,7 +3371,7 @@ It is implemented roughly as: - context = (EXPR).__context__() + context = EXPR exit = context.__exit__ # not calling it value = context.__enter__() try: @@ -3387,17 +3387,12 @@ static int compiler_with(struct compiler *c, stmt_ty s) { - static identifier context_attr, enter_attr, exit_attr; + static identifier enter_attr, exit_attr; basicblock *block, *finally; identifier tmpexit, tmpvalue = NULL; assert(s->kind == With_kind); - if (!context_attr) { - context_attr = PyString_InternFromString("__context__"); - if (!context_attr) - return 0; - } if (!enter_attr) { enter_attr = PyString_InternFromString("__enter__"); if (!enter_attr) @@ -3436,10 +3431,8 @@ PyArena_AddPyObject(c->c_arena, tmpvalue); } - /* Evaluate (EXPR).__context__() */ + /* Evaluate EXPR */ VISIT(c, expr, s->v.With.context_expr); - ADDOP_O(c, LOAD_ATTR, context_attr, names); - ADDOP_I(c, CALL_FUNCTION, 0); /* Squirrel away context.__exit__ */ ADDOP(c, DUP_TOP); From python-checkins at python.org Tue May 2 21:52:33 2006 From: python-checkins at python.org (armin.rigo) Date: Tue, 2 May 2006 21:52:33 +0200 (CEST) Subject: [Python-checkins] r45863 - python/trunk/Doc/api/refcounts.dat Message-ID: <20060502195233.25D2C1E4012@bag.python.org> Author: armin.rigo Date: Tue May 2 21:52:32 2006 New Revision: 45863 Modified: python/trunk/Doc/api/refcounts.dat Log: Documentation bug: PySet_Pop() returns a new reference (because the caller becomes the owner of that reference). Modified: python/trunk/Doc/api/refcounts.dat ============================================================================== --- python/trunk/Doc/api/refcounts.dat (original) +++ python/trunk/Doc/api/refcounts.dat Tue May 2 21:52:32 2006 @@ -1147,7 +1147,7 @@ PySet_New:PyObject*::+1: PySet_New:PyObject*:iterable:0: -PySet_Pop:PyObject*::0:or returns NULL and raises KeyError if set is empty +PySet_Pop:PyObject*::+1:or returns NULL and raises KeyError if set is empty PySet_Pop:PyObject*:set:0: PySet_Size:int::: From python-checkins at python.org Tue May 2 22:47:36 2006 From: python-checkins at python.org (guido.van.rossum) Date: Tue, 2 May 2006 22:47:36 +0200 (CEST) Subject: [Python-checkins] r45864 - python/trunk/Lib/test/test_mailbox.py Message-ID: <20060502204736.DAE871E4013@bag.python.org> Author: guido.van.rossum Date: Tue May 2 22:47:36 2006 New Revision: 45864 Modified: python/trunk/Lib/test/test_mailbox.py Log: Hopefully this will fix the spurious failures of test_mailbox.py that I'm experiencing. (This code and mailbox.py itself are full of calls to file() that should be calls to open() -- but I'm not fixing those.) Modified: python/trunk/Lib/test/test_mailbox.py ============================================================================== --- python/trunk/Lib/test/test_mailbox.py (original) +++ python/trunk/Lib/test/test_mailbox.py Tue May 2 22:47:36 2006 @@ -577,14 +577,18 @@ # Remove old files from 'tmp' foo_path = os.path.join(self._path, 'tmp', 'foo') bar_path = os.path.join(self._path, 'tmp', 'bar') - file(foo_path, 'w').close() - file(bar_path, 'w').close() + f = open(foo_path, 'w') + f.write("@") + f.close() + f = open(bar_path, 'w') + f.write("@") + f.close() self._box.clean() self.assert_(os.path.exists(foo_path)) self.assert_(os.path.exists(bar_path)) foo_stat = os.stat(foo_path) - os.utime(os.path.join(foo_path), (time.time() - 129600 - 2, - foo_stat.st_mtime)) + os.utime(foo_path, (time.time() - 129600 - 2, + foo_stat.st_mtime)) self._box.clean() self.assert_(not os.path.exists(foo_path)) self.assert_(os.path.exists(bar_path)) From martin at v.loewis.de Tue May 2 23:28:25 2006 From: martin at v.loewis.de (=?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?=) Date: Tue, 02 May 2006 23:28:25 +0200 Subject: [Python-checkins] r45839 - python/trunk/Doc/lib/lib.tex python/trunk/Doc/lib/libmsilib.tex In-Reply-To: References: <20060501161245.7AF361E4011@bag.python.org> Message-ID: <4457CEF9.4000307@v.loewis.de> Jim Jewett wrote: > Is there an URL describing these formats? Not to my knowledge: they are both undocumented (MSI probably more so than CAB, for which third-party tools exist). >> +\begin{funcdesc}{FCICreate}{cabname, files} >> + Create a new CAB file named \var{cabname}. \var{files} must >> + be a list of tuples, each containing the name of the file on >> + disk, and the name of the file inside the CAB file. >> + >> + The files are added to the CAB file in the order they have >> + in the list. All files are added into a single CAB file, >> + using the MSZIP compression algorithm. > > Should that be "in the order that they appear in the list"/ If that is better English: sure. > Is there a good URL for the MSZIP format? > > google pointed at non-MS sources, though one suggested > http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dncabsdk/html/cabdl.asp That's only the SDK, though, and it only has API specs; these are the ones that _msi.c uses. In any case, I want to replace MSZIP with LZX:21 before the release (not that this is better documented). >> +\begin{funcdesc}{OpenDatabase}{path, persist} >> + Return a new database object by calling MsiOpenDatabase. >> + \var{path} is the file name of the >> + MSI file; persist can be one of the constants >> + \code{MSIDBOPEN_CREATEDIRECT}, \code{MSIDBOPEN_CREATE}, >> + \code{MSIDBOPEN_DIRECT}, \code{MSIDBOPEN_READONLY}, or >> + \code{MSIDBOPEN_TRANSACT}, and may include the flag >> + \code{MSIDBOPEN_PATCHFILE}. See the Microsoft documentation for >> + the meaning of these flags; depending on the flags, >> + an existing database is opened, or a new one created. >> +\end{funcdesc} > > Any particular place in the documentation? Preferably an URL That's in the see-also section already, for MsiOpenDatabase. >> + This is typically used to install the sequence >> +\end{funcdesc} > > Is that last sentence complete? Ah, no. It should end with "tables." Thanks, Martin From python-checkins at python.org Tue May 2 23:44:34 2006 From: python-checkins at python.org (andrew.kuchling) Date: Tue, 2 May 2006 23:44:34 +0200 (CEST) Subject: [Python-checkins] r45865 - in python/trunk/Lib: mailbox.py test/test_mailbox.py Message-ID: <20060502214434.0ED891E4005@bag.python.org> Author: andrew.kuchling Date: Tue May 2 23:44:33 2006 New Revision: 45865 Modified: python/trunk/Lib/mailbox.py python/trunk/Lib/test/test_mailbox.py Log: Use open() instead of file() Modified: python/trunk/Lib/mailbox.py ============================================================================== --- python/trunk/Lib/mailbox.py (original) +++ python/trunk/Lib/mailbox.py Tue May 2 23:44:33 2006 @@ -294,7 +294,7 @@ def get_message(self, key): """Return a Message representation or raise a KeyError.""" subpath = self._lookup(key) - f = file(os.path.join(self._path, subpath), 'r') + f = open(os.path.join(self._path, subpath), 'r') try: msg = MaildirMessage(f) finally: @@ -308,7 +308,7 @@ def get_string(self, key): """Return a string representation or raise a KeyError.""" - f = file(os.path.join(self._path, self._lookup(key)), 'r') + f = open(os.path.join(self._path, self._lookup(key)), 'r') try: return f.read() finally: @@ -316,7 +316,7 @@ def get_file(self, key): """Return a file-like representation or raise a KeyError.""" - f = file(os.path.join(self._path, self._lookup(key)), 'rb') + f = open(os.path.join(self._path, self._lookup(key)), 'rb') return _ProxyFile(f) def iterkeys(self): @@ -422,7 +422,7 @@ except OSError, e: if e.errno == errno.ENOENT: Maildir._count += 1 - return file(path, 'wb+') + return open(path, 'wb+') else: raise else: @@ -471,15 +471,15 @@ """Initialize a single-file mailbox.""" Mailbox.__init__(self, path, factory, create) try: - f = file(self._path, 'rb+') + f = open(self._path, 'rb+') except IOError, e: if e.errno == errno.ENOENT: if create: - f = file(self._path, 'wb+') + f = open(self._path, 'wb+') else: raise NoSuchMailboxError(self._path) elif e.errno == errno.EACCES: - f = file(self._path, 'rb') + f = open(self._path, 'rb') else: raise self._file = f @@ -572,7 +572,7 @@ os.rename(new_file.name, self._path) else: raise - self._file = file(self._path, 'rb+') + self._file = open(self._path, 'rb+') self._toc = new_toc self._pending = False if self._locked: @@ -792,7 +792,7 @@ """Remove the keyed message; raise KeyError if it doesn't exist.""" path = os.path.join(self._path, str(key)) try: - f = file(path, 'rb+') + f = open(path, 'rb+') except IOError, e: if e.errno == errno.ENOENT: raise KeyError('No message with key: %s' % key) @@ -814,7 +814,7 @@ """Replace the keyed message; raise KeyError if it doesn't exist.""" path = os.path.join(self._path, str(key)) try: - f = file(path, 'rb+') + f = open(path, 'rb+') except IOError, e: if e.errno == errno.ENOENT: raise KeyError('No message with key: %s' % key) @@ -838,9 +838,9 @@ """Return a Message representation or raise a KeyError.""" try: if self._locked: - f = file(os.path.join(self._path, str(key)), 'r+') + f = open(os.path.join(self._path, str(key)), 'r+') else: - f = file(os.path.join(self._path, str(key)), 'r') + f = open(os.path.join(self._path, str(key)), 'r') except IOError, e: if e.errno == errno.ENOENT: raise KeyError('No message with key: %s' % key) @@ -865,9 +865,9 @@ """Return a string representation or raise a KeyError.""" try: if self._locked: - f = file(os.path.join(self._path, str(key)), 'r+') + f = open(os.path.join(self._path, str(key)), 'r+') else: - f = file(os.path.join(self._path, str(key)), 'r') + f = open(os.path.join(self._path, str(key)), 'r') except IOError, e: if e.errno == errno.ENOENT: raise KeyError('No message with key: %s' % key) @@ -887,7 +887,7 @@ def get_file(self, key): """Return a file-like representation or raise a KeyError.""" try: - f = file(os.path.join(self._path, str(key)), 'rb') + f = open(os.path.join(self._path, str(key)), 'rb') except IOError, e: if e.errno == errno.ENOENT: raise KeyError('No message with key: %s' % key) @@ -911,7 +911,7 @@ def lock(self): """Lock the mailbox.""" if not self._locked: - self._file = file(os.path.join(self._path, '.mh_sequences'), 'rb+') + self._file = open(os.path.join(self._path, '.mh_sequences'), 'rb+') _lock_file(self._file) self._locked = True @@ -963,7 +963,7 @@ def get_sequences(self): """Return a name-to-key-list dictionary to define each sequence.""" results = {} - f = file(os.path.join(self._path, '.mh_sequences'), 'r') + f = open(os.path.join(self._path, '.mh_sequences'), 'r') try: all_keys = set(self.keys()) for line in f: @@ -989,7 +989,7 @@ def set_sequences(self, sequences): """Set sequences using the given name-to-key-list dictionary.""" - f = file(os.path.join(self._path, '.mh_sequences'), 'r+') + f = open(os.path.join(self._path, '.mh_sequences'), 'r+') try: os.close(os.open(f.name, os.O_WRONLY | os.O_TRUNC)) for name, keys in sequences.iteritems(): @@ -1024,7 +1024,7 @@ for key in self.iterkeys(): if key - 1 != prev: changes.append((key, prev + 1)) - f = file(os.path.join(self._path, str(key)), 'r+') + f = open(os.path.join(self._path, str(key)), 'r+') try: if self._locked: _lock_file(f) @@ -1864,7 +1864,7 @@ """Create a file if it doesn't exist and open for reading and writing.""" fd = os.open(path, os.O_CREAT | os.O_EXCL | os.O_RDWR) try: - return file(path, 'rb+') + return open(path, 'rb+') finally: os.close(fd) Modified: python/trunk/Lib/test/test_mailbox.py ============================================================================== --- python/trunk/Lib/test/test_mailbox.py (original) +++ python/trunk/Lib/test/test_mailbox.py Tue May 2 23:44:33 2006 @@ -717,7 +717,7 @@ self._box._file.seek(0) contents = self._box._file.read() self._box.close() - self.assert_(contents == file(self._path, 'rb').read()) + self.assert_(contents == open(self._path, 'rb').read()) self._box = self._factory(self._path) @@ -1473,7 +1473,7 @@ def setUp(self): self._path = test_support.TESTFN - self._file = file(self._path, 'wb+') + self._file = open(self._path, 'wb+') def tearDown(self): self._file.close() @@ -1522,7 +1522,7 @@ def setUp(self): self._path = test_support.TESTFN - self._file = file(self._path, 'wb+') + self._file = open(self._path, 'wb+') def tearDown(self): self._file.close() From python-checkins at python.org Wed May 3 00:47:50 2006 From: python-checkins at python.org (andrew.kuchling) Date: Wed, 3 May 2006 00:47:50 +0200 (CEST) Subject: [Python-checkins] r45866 - python/trunk/Doc/whatsnew/whatsnew25.tex Message-ID: <20060502224750.6819B1E401F@bag.python.org> Author: andrew.kuchling Date: Wed May 3 00:47:49 2006 New Revision: 45866 Modified: python/trunk/Doc/whatsnew/whatsnew25.tex Log: Update context manager section for removal of __context__ Modified: python/trunk/Doc/whatsnew/whatsnew25.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew25.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew25.tex Wed May 3 00:47:49 2006 @@ -638,7 +638,8 @@ the block is complete. The \module{decimal} module's contexts, which encapsulate the desired -precision and rounding characteristics for computations, also work. +precision and rounding characteristics for computations, provide a +\method{context_manager()} method for getting a context manager: \begin{verbatim} import decimal @@ -647,7 +648,8 @@ v1 = decimal.Decimal('578') print v1.sqrt() -with decimal.Context(prec=16): +ctx = decimal.Context(prec=16) +with ctx.context_manager(): # All code in this block uses a precision of 16 digits. # The original context is restored on exiting the block. print v1.sqrt() @@ -665,14 +667,12 @@ A high-level explanation of the context management protocol is: \begin{itemize} -\item The expression is evaluated and should result in an object -with a \method{__context__()} method (called a ``context manager''). -\item The context specifier's \method{__context__()} method is called, -and must return another object (called a ``with-statement context object'') that has +\item The expression is evaluated and should result in an object +called a ``context manager''. The context manager must have \method{__enter__()} and \method{__exit__()} methods. -\item The context object's \method{__enter__()} method is called. The value +\item The context manager's \method{__enter__()} method is called. The value returned is assigned to \var{VAR}. If no \code{'as \var{VAR}'} clause is present, the value is simply discarded. @@ -680,7 +680,7 @@ \item If \var{BLOCK} raises an exception, the \method{__exit__(\var{type}, \var{value}, \var{traceback})} is called -with the exception's information, the same values returned by +with the exception details, the same values returned by \function{sys.exc_info()}. The method's return value controls whether the exception is re-raised: any false value re-raises the exception, and \code{True} will result in suppressing it. You'll only rarely @@ -719,20 +719,11 @@ The transaction should be committed if the code in the block runs flawlessly or rolled back if there's an exception. - -First, the \class{DatabaseConnection} needs a \method{__context__()} -method. Sometimes an object can simply return \code{self}; the -\module{threading} module's lock objects do this, for example. For -our database example, though, we need to create a new object; I'll -call this class \class{DatabaseContext}. Our \method{__context__()} -method must therefore look like this: +Here's the basic interface +for \class{DatabaseConnection} that I'll assume: \begin{verbatim} class DatabaseConnection: - ... - def __context__ (self): - return DatabaseContext(self) - # Database interface def cursor (self): "Returns a cursor object and starts a new transaction" @@ -742,16 +733,6 @@ "Rolls back current transaction" \end{verbatim} -Instances of \class{DatabaseContext} need the connection object so that -the connection object's \method{commit()} or \method{rollback()} -methods can be called: - -\begin{verbatim} -class DatabaseContext: - def __init__ (self, connection): - self.connection = connection -\end{verbatim} - The \method {__enter__()} method is pretty easy, having only to start a new transaction. For this application the resulting cursor object would be a useful result, so the method will return it. The user can @@ -759,11 +740,11 @@ the cursor to a variable name. \begin{verbatim} -class DatabaseContext: +class DatabaseConnection: ... def __enter__ (self): # Code to start a new transaction - cursor = self.connection.cursor() + cursor = self.cursor() return cursor \end{verbatim} @@ -779,15 +760,15 @@ statement at the marked location. \begin{verbatim} -class DatabaseContext: +class DatabaseConnection: ... def __exit__ (self, type, value, tb): if tb is None: # No exception, so commit - self.connection.commit() + self.commit() else: # Exception occurred, so rollback. - self.connection.rollback() + self.rollback() # return False \end{verbatim} @@ -830,27 +811,8 @@ ... \end{verbatim} -You can also use this decorator to write the \method{__context__()} -method for a class: - -\begin{verbatim} -class DatabaseConnection: - - @contextfactory - def __context__ (self): - cursor = self.cursor() - try: - yield cursor - except: - self.rollback() - raise - else: - self.commit() -\end{verbatim} - - The \module{contextlib} module also has a \function{nested(\var{mgr1}, -\var{mgr2}, ...)} function that combines a number of contexts so you +\var{mgr2}, ...)} function that combines a number of context managers so you don't need to write nested '\keyword{with}' statements. In this example, the single '\keyword{with}' statement both starts a database transaction and acquires a thread lock: From buildbot at python.org Wed May 3 01:31:45 2006 From: buildbot at python.org (buildbot at python.org) Date: Tue, 02 May 2006 23:31:45 +0000 Subject: [Python-checkins] buildbot warnings in ia64 Debian unstable trunk Message-ID: <20060502233145.CEAF61E4005@bag.python.org> The Buildbot has detected a new failure of ia64 Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%2520Debian%2520unstable%2520trunk/builds/340 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: andrew.kuchling Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Wed May 3 03:46:52 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 03:46:52 +0200 (CEST) Subject: [Python-checkins] r45867 - python/trunk/Doc/perl/python.perl Message-ID: <20060503014652.DE6B01E4005@bag.python.org> Author: fred.drake Date: Wed May 3 03:46:52 2006 New Revision: 45867 Modified: python/trunk/Doc/perl/python.perl Log: remove unnecessary assignment Modified: python/trunk/Doc/perl/python.perl ============================================================================== --- python/trunk/Doc/perl/python.perl (original) +++ python/trunk/Doc/perl/python.perl Wed May 3 03:46:52 2006 @@ -530,7 +530,6 @@ sub new_link_name_info(){ my $name = "l2h-" . ++$globals{'max_id'}; - my $aname = ""; my $ahref = gen_link($CURRENT_FILE, $name); return ($name, $ahref); } From python-checkins at python.org Wed May 3 03:48:24 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 03:48:24 +0200 (CEST) Subject: [Python-checkins] r45868 - python/trunk/Doc/perl/l2hinit.perl Message-ID: <20060503014824.BBB601E4005@bag.python.org> Author: fred.drake Date: Wed May 3 03:48:24 2006 New Revision: 45868 Modified: python/trunk/Doc/perl/l2hinit.perl Log: tell LaTeX2HTML to: - use UTF-8 output - not mess with the >>> prompt! Modified: python/trunk/Doc/perl/l2hinit.perl ============================================================================== --- python/trunk/Doc/perl/l2hinit.perl (original) +++ python/trunk/Doc/perl/l2hinit.perl Wed May 3 03:48:24 2006 @@ -4,7 +4,14 @@ use L2hos; -$HTML_VERSION = 4.0; +$HTML_VERSION = 4.01; +$LOWER_CASE_TAGS = 1; +$NO_FRENCH_QUOTES = 1; + +# Force Unicode support to be loaded; request UTF-8 output. +do_require_extension('unicode'); +do_require_extension('utf8'); +$HTML_OPTIONS = 'utf8'; $MAX_LINK_DEPTH = 2; $ADDRESS = ''; @@ -106,6 +113,13 @@ $ENV{'TEXINPUTS'} = undef; } print "\nSetting \$TEXINPUTS to $TEXINPUTS\n"; + + # Not sure why we need to deal with this both here and at the top, + # but this is needed to actually make it work. + do_require_extension('utf8'); + $charset = $utf8_str; + $CHARSET = $utf8_str; + $USE_UTF = 1; } From buildbot at python.org Wed May 3 04:03:16 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 02:03:16 +0000 Subject: [Python-checkins] buildbot warnings in x86 XP-2 trunk Message-ID: <20060503020316.3A3EA1E4023@bag.python.org> The Buildbot has detected a new failure of x86 XP-2 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP-2%2520trunk/builds/423 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: fred.drake Build Had Warnings: warnings failed slave lost sincerely, -The Buildbot From python-checkins at python.org Wed May 3 04:04:48 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 04:04:48 +0200 (CEST) Subject: [Python-checkins] r45869 - in python/trunk/Doc: api/abstract.tex ext/windows.tex lib/libcodeop.tex lib/libdoctest.tex lib/libhtmlparser.tex lib/liboperator.tex lib/libsys.tex lib/libtrace.tex ref/ref3.tex ref/ref5.tex ref/ref6.tex tut/glossary.tex tut/tut.tex whatsnew/whatsnew20.tex Message-ID: <20060503020448.36B981E4012@bag.python.org> Author: fred.drake Date: Wed May 3 04:04:40 2006 New Revision: 45869 Modified: python/trunk/Doc/api/abstract.tex python/trunk/Doc/ext/windows.tex python/trunk/Doc/lib/libcodeop.tex python/trunk/Doc/lib/libdoctest.tex python/trunk/Doc/lib/libhtmlparser.tex python/trunk/Doc/lib/liboperator.tex python/trunk/Doc/lib/libsys.tex python/trunk/Doc/lib/libtrace.tex python/trunk/Doc/ref/ref3.tex python/trunk/Doc/ref/ref5.tex python/trunk/Doc/ref/ref6.tex python/trunk/Doc/tut/glossary.tex python/trunk/Doc/tut/tut.tex python/trunk/Doc/whatsnew/whatsnew20.tex Log: avoid ugly markup based on the unfortunate conversions of ">>" and "<<" to guillemets; no need for magic here Modified: python/trunk/Doc/api/abstract.tex ============================================================================== --- python/trunk/Doc/api/abstract.tex (original) +++ python/trunk/Doc/api/abstract.tex Wed May 3 04:04:40 2006 @@ -630,7 +630,7 @@ Returns the result of right shifting \var{o1} by \var{o2} on success, or \NULL{} on failure. The operation is done \emph{in-place} when \var{o1} supports it. This is the equivalent - of the Python statement \samp{\var{o1} >\code{>=} \var{o2}}. + of the Python statement \samp{\var{o1} >>= \var{o2}}. \end{cfuncdesc} Modified: python/trunk/Doc/ext/windows.tex ============================================================================== --- python/trunk/Doc/ext/windows.tex (original) +++ python/trunk/Doc/ext/windows.tex Wed May 3 04:04:40 2006 @@ -88,7 +88,7 @@ Once the Debug build has succeeded, bring up a DOS box, and change to the \file{example_nt\textbackslash Debug} directory. You should now be able to repeat the following session (\code{C>} is - the DOS prompt, \code{>\code{>}>} is the Python prompt; note that + the DOS prompt, \code{>>>} is the Python prompt; note that build information and various debug output from Python may not match this screen dump exactly): Modified: python/trunk/Doc/lib/libcodeop.tex ============================================================================== --- python/trunk/Doc/lib/libcodeop.tex (original) +++ python/trunk/Doc/lib/libcodeop.tex Wed May 3 04:04:40 2006 @@ -19,7 +19,7 @@ \begin{enumerate} \item Being able to tell if a line of input completes a Python statement: in short, telling whether to print - `\code{>\code{>}>~}' or `\code{...~}' next. + `\code{>>>~}' or `\code{...~}' next. \item Remembering which future statements the user has entered, so subsequent input can be compiled with these in effect. \end{enumerate} Modified: python/trunk/Doc/lib/libdoctest.tex ============================================================================== --- python/trunk/Doc/lib/libdoctest.tex (original) +++ python/trunk/Doc/lib/libdoctest.tex Wed May 3 04:04:40 2006 @@ -333,8 +333,8 @@ \end{verbatim} Any expected output must immediately follow the final -\code{'>\code{>}>~'} or \code{'...~'} line containing the code, and -the expected output (if any) extends to the next \code{'>\code{>}>~'} +\code{'>>>~'} or \code{'...~'} line containing the code, and +the expected output (if any) extends to the next \code{'>>>~'} or all-whitespace line. The fine print: @@ -386,7 +386,7 @@ \end{verbatim} and as many leading whitespace characters are stripped from the -expected output as appeared in the initial \code{'>\code{>}>~'} line +expected output as appeared in the initial \code{'>>>~'} line that started the example. \end{itemize} Modified: python/trunk/Doc/lib/libhtmlparser.tex ============================================================================== --- python/trunk/Doc/lib/libhtmlparser.tex (original) +++ python/trunk/Doc/lib/libhtmlparser.tex Wed May 3 04:04:40 2006 @@ -132,7 +132,7 @@ \begin{methoddesc}{handle_decl}{decl} Method called when an SGML declaration is read by the parser. The \var{decl} parameter will be the entire contents of the declaration -inside the \code{} markup.It is intended to be overridden +inside the \code{} markup. It is intended to be overridden by a derived class; the base class implementation does nothing. \end{methoddesc} Modified: python/trunk/Doc/lib/liboperator.tex ============================================================================== --- python/trunk/Doc/lib/liboperator.tex (original) +++ python/trunk/Doc/lib/liboperator.tex Wed May 3 04:04:40 2006 @@ -320,7 +320,7 @@ \begin{funcdesc}{irshift}{a, b} \funcline{__irshift__}{a, b} -\code{a = irshift(a, b)} is equivalent to \code{a >}\code{>= b}. +\code{a = irshift(a, b)} is equivalent to \code{a >>= b}. \versionadded{2.5} \end{funcdesc} @@ -499,7 +499,7 @@ {\code{neg(\var{a})}} \lineiii{Negation (Logical)}{\code{not \var{a}}} {\code{not_(\var{a})}} - \lineiii{Right Shift}{\code{\var{a} >\code{>} \var{b}}} + \lineiii{Right Shift}{\code{\var{a} >> \var{b}}} {\code{rshift(\var{a}, \var{b})}} \lineiii{Sequence Repitition}{\code{\var{seq} * \var{i}}} {\code{repeat(\var{seq}, \var{i})}} Modified: python/trunk/Doc/lib/libsys.tex ============================================================================== --- python/trunk/Doc/lib/libsys.tex (original) +++ python/trunk/Doc/lib/libsys.tex Wed May 3 04:04:40 2006 @@ -410,7 +410,7 @@ Strings specifying the primary and secondary prompt of the interpreter. These are only defined if the interpreter is in interactive mode. Their initial values in this case are - \code{'>\code{>}> '} and \code{'... '}. If a non-string object is + \code{'>>>~'} and \code{'... '}. If a non-string object is assigned to either variable, its \function{str()} is re-evaluated each time the interpreter prepares to read a new interactive command; this can be used to implement a dynamic prompt. Modified: python/trunk/Doc/lib/libtrace.tex ============================================================================== --- python/trunk/Doc/lib/libtrace.tex (original) +++ python/trunk/Doc/lib/libtrace.tex Wed May 3 04:04:40 2006 @@ -54,7 +54,7 @@ \item[\longprogramopt{missing}, \programopt{-m}] When generating annotated listings, mark lines which -were not executed with \code{>}\code{>}\code{>}\code{>}\code{>}\code{>}. +were not executed with `\code{>>>>>>}'. \item[\longprogramopt{summary}, \programopt{-s}] When using \longprogramopt{count} or \longprogramopt{report}, write a Modified: python/trunk/Doc/ref/ref3.tex ============================================================================== --- python/trunk/Doc/ref/ref3.tex (original) +++ python/trunk/Doc/ref/ref3.tex Wed May 3 04:04:40 2006 @@ -1875,8 +1875,8 @@ called to implement the binary arithmetic operations (\code{+}, \code{-}, \code{*}, \code{//}, \code{\%}, \function{divmod()}\bifuncindex{divmod}, -\function{pow()}\bifuncindex{pow}, \code{**}, \code{<}\code{<}, -\code{>}\code{>}, \code{\&}, \code{\^}, \code{|}). For instance, to +\function{pow()}\bifuncindex{pow}, \code{**}, \code{<<}, +\code{>>}, \code{\&}, \code{\^}, \code{|}). For instance, to evaluate the expression \var{x}\code{+}\var{y}, where \var{x} is an instance of a class that has an \method{__add__()} method, \code{\var{x}.__add__(\var{y})} is called. The \method{__divmod__()} @@ -1915,8 +1915,8 @@ called to implement the binary arithmetic operations (\code{+}, \code{-}, \code{*}, \code{/}, \code{\%}, \function{divmod()}\bifuncindex{divmod}, -\function{pow()}\bifuncindex{pow}, \code{**}, \code{<}\code{<}, -\code{>}\code{>}, \code{\&}, \code{\^}, \code{|}) with reflected +\function{pow()}\bifuncindex{pow}, \code{**}, \code{<<}, +\code{>>}, \code{\&}, \code{\^}, \code{|}) with reflected (swapped) operands. These functions are only called if the left operand does not support the corresponding operation. For instance, to evaluate the expression \var{x}\code{-}\var{y}, where \var{y} is an @@ -1942,7 +1942,7 @@ \methodline[numeric object]{__ior__}{self, other} These methods are called to implement the augmented arithmetic operations (\code{+=}, \code{-=}, \code{*=}, \code{/=}, \code{\%=}, -\code{**=}, \code{<}\code{<=}, \code{>}\code{>=}, \code{\&=}, +\code{**=}, \code{<<=}, \code{>>=}, \code{\&=}, \code{\textasciicircum=}, \code{|=}). These methods should attempt to do the operation in-place (modifying \var{self}) and return the result (which could be, but does not have to be, \var{self}). If a specific method Modified: python/trunk/Doc/ref/ref5.tex ============================================================================== --- python/trunk/Doc/ref/ref5.tex (original) +++ python/trunk/Doc/ref/ref5.tex Wed May 3 04:04:40 2006 @@ -1158,7 +1158,7 @@ \hline \lineii{\code{\&}} {Bitwise AND} \hline - \lineii{\code{<}\code{<}, \code{>}\code{>}} {Shifts} + \lineii{\code{<<}, \code{>>}} {Shifts} \hline \lineii{\code{+}, \code{-}}{Addition and subtraction} \hline Modified: python/trunk/Doc/ref/ref6.tex ============================================================================== --- python/trunk/Doc/ref/ref6.tex (original) +++ python/trunk/Doc/ref/ref6.tex Wed May 3 04:04:40 2006 @@ -377,7 +377,7 @@ \begin{productionlist} \production{print_stmt} {"print" ( \optional{\token{expression} ("," \token{expression})* \optional{","}}} - \productioncont{| ">\code{>}" \token{expression} + \productioncont{| ">>" \token{expression} \optional{("," \token{expression})+ \optional{","}} )} \end{productionlist} Modified: python/trunk/Doc/tut/glossary.tex ============================================================================== --- python/trunk/Doc/tut/glossary.tex (original) +++ python/trunk/Doc/tut/glossary.tex Wed May 3 04:04:40 2006 @@ -7,7 +7,7 @@ \index{>>>} -\item[\code{>\code{>}>}] +\item[\code{>>>}] The typical Python prompt of the interactive shell. Often seen for code examples that can be tried right away in the interpreter. Modified: python/trunk/Doc/tut/tut.tex ============================================================================== --- python/trunk/Doc/tut/tut.tex (original) +++ python/trunk/Doc/tut/tut.tex Wed May 3 04:04:40 2006 @@ -264,7 +264,7 @@ When commands are read from a tty, the interpreter is said to be in \emph{interactive mode}. In this mode it prompts for the next command with the \emph{primary prompt}, usually three greater-than signs -(\samp{>\code{>}>~}); for continuation lines it prompts with the +(\samp{>>>~}); for continuation lines it prompts with the \emph{secondary prompt}, by default three dots (\samp{...~}). The interpreter prints a welcome message stating its version number and a copyright notice before printing the first prompt: @@ -423,7 +423,7 @@ \chapter{An Informal Introduction to Python \label{informal}} In the following examples, input and output are distinguished by the -presence or absence of prompts (\samp{>\code{>}>~} and \samp{...~}): to repeat +presence or absence of prompts (\samp{>>>~} and \samp{...~}): to repeat the example, you must type everything after the prompt, when the prompt appears; lines that do not begin with a prompt are output from the interpreter. % @@ -455,7 +455,7 @@ \section{Using Python as a Calculator \label{calculator}} Let's try some simple Python commands. Start the interpreter and wait -for the primary prompt, \samp{>\code{>}>~}. (It shouldn't take long.) +for the primary prompt, \samp{>>>~}. (It shouldn't take long.) \subsection{Numbers \label{numbers}} Modified: python/trunk/Doc/whatsnew/whatsnew20.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew20.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew20.tex Wed May 3 04:04:40 2006 @@ -400,7 +400,7 @@ % The empty groups below prevent conversion to guillemets. The full list of supported assignment operators is \code{+=}, \code{-=}, \code{*=}, \code{/=}, \code{\%=}, \code{**=}, \code{\&=}, -\code{|=}, \verb|^=|, \code{>{}>=}, and \code{<{}<=}. Python classes can +\code{|=}, \verb|^=|, \code{>>=}, and \code{<<=}. Python classes can override the augmented assignment operators by defining methods named \method{__iadd__}, \method{__isub__}, etc. For example, the following \class{Number} class stores a number and supports using += to create a From python-checkins at python.org Wed May 3 04:12:49 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 04:12:49 +0200 (CEST) Subject: [Python-checkins] r45870 - python/trunk/Doc/perl/l2hinit.perl Message-ID: <20060503021249.F19CF1E4012@bag.python.org> Author: fred.drake Date: Wed May 3 04:12:47 2006 New Revision: 45870 Modified: python/trunk/Doc/perl/l2hinit.perl Log: at least comment on why curly-quotes are not enabled Modified: python/trunk/Doc/perl/l2hinit.perl ============================================================================== --- python/trunk/Doc/perl/l2hinit.perl (original) +++ python/trunk/Doc/perl/l2hinit.perl Wed May 3 04:12:47 2006 @@ -8,6 +8,9 @@ $LOWER_CASE_TAGS = 1; $NO_FRENCH_QUOTES = 1; +# '' in \code{...} is still converted, so we can't use this yet. +#$USE_CURLY_QUOTES = 1; + # Force Unicode support to be loaded; request UTF-8 output. do_require_extension('unicode'); do_require_extension('utf8'); From python-checkins at python.org Wed May 3 04:27:42 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 04:27:42 +0200 (CEST) Subject: [Python-checkins] r45871 - python/trunk/Doc/ref/ref6.tex Message-ID: <20060503022742.1ECC61E4005@bag.python.org> Author: fred.drake Date: Wed May 3 04:27:40 2006 New Revision: 45871 Modified: python/trunk/Doc/ref/ref6.tex Log: one more place to avoid extra markup Modified: python/trunk/Doc/ref/ref6.tex ============================================================================== --- python/trunk/Doc/ref/ref6.tex (original) +++ python/trunk/Doc/ref/ref6.tex Wed May 3 04:27:40 2006 @@ -417,7 +417,7 @@ \keyword{print} also has an extended\index{extended print statement} form, defined by the second portion of the syntax described above. This form is sometimes referred to as ``\keyword{print} chevron.'' -In this form, the first expression after the \code{>}\code{>} must +In this form, the first expression after the \code{>>} must evaluate to a ``file-like'' object, specifically an object that has a \method{write()} method as described above. With this extended form, the subsequent expressions are printed to this file object. If the From python-checkins at python.org Wed May 3 04:29:10 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 04:29:10 +0200 (CEST) Subject: [Python-checkins] r45872 - python/trunk/Doc/lib/libdis.tex Message-ID: <20060503022910.5738C1E4005@bag.python.org> Author: fred.drake Date: Wed May 3 04:29:09 2006 New Revision: 45872 Modified: python/trunk/Doc/lib/libdis.tex Log: one more place to avoid extra markup (how many will there be?) Modified: python/trunk/Doc/lib/libdis.tex ============================================================================== --- python/trunk/Doc/lib/libdis.tex (original) +++ python/trunk/Doc/lib/libdis.tex Wed May 3 04:29:09 2006 @@ -55,7 +55,7 @@ \begin{enumerate} \item the line number, for the first instruction of each line \item the current instruction, indicated as \samp{-->}, -\item a labelled instruction, indicated with \samp{>\code{>}}, +\item a labelled instruction, indicated with \samp{>>}, \item the address of the instruction, \item the operation code name, \item operation parameters, and From python-checkins at python.org Wed May 3 04:29:40 2006 From: python-checkins at python.org (fred.drake) Date: Wed, 3 May 2006 04:29:40 +0200 (CEST) Subject: [Python-checkins] r45873 - python/trunk/Doc/lib/libsys.tex Message-ID: <20060503022940.42CDC1E4005@bag.python.org> Author: fred.drake Date: Wed May 3 04:29:39 2006 New Revision: 45873 Modified: python/trunk/Doc/lib/libsys.tex Log: fix up whitespace in prompt strings Modified: python/trunk/Doc/lib/libsys.tex ============================================================================== --- python/trunk/Doc/lib/libsys.tex (original) +++ python/trunk/Doc/lib/libsys.tex Wed May 3 04:29:39 2006 @@ -410,7 +410,7 @@ Strings specifying the primary and secondary prompt of the interpreter. These are only defined if the interpreter is in interactive mode. Their initial values in this case are - \code{'>>>~'} and \code{'... '}. If a non-string object is + \code{'>>>~'} and \code{'...~'}. If a non-string object is assigned to either variable, its \function{str()} is re-evaluated each time the interpreter prepares to read a new interactive command; this can be used to implement a dynamic prompt. From buildbot at python.org Wed May 3 05:07:19 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 03:07:19 +0000 Subject: [Python-checkins] buildbot warnings in hppa Ubuntu dapper trunk Message-ID: <20060503030719.A26AB1E4005@bag.python.org> The Buildbot has detected a new failure of hppa Ubuntu dapper trunk. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%2520trunk/builds/355 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: fred.drake Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Wed May 3 05:52:48 2006 From: python-checkins at python.org (sean.reifschneider) Date: Wed, 3 May 2006 05:52:48 +0200 (CEST) Subject: [Python-checkins] r45874 - peps/trunk/pep-0243.txt Message-ID: <20060503035248.BE19B1E4005@bag.python.org> Author: sean.reifschneider Date: Wed May 3 05:52:47 2006 New Revision: 45874 Modified: peps/trunk/pep-0243.txt Log: Withdrawing. Modified: peps/trunk/pep-0243.txt ============================================================================== --- peps/trunk/pep-0243.txt (original) +++ peps/trunk/pep-0243.txt Wed May 3 05:52:47 2006 @@ -4,7 +4,7 @@ Last-Modified: $Date$ Author: jafo-pep at tummy.com (Sean Reifschneider) Discussions-To: distutils-sig at python.org -Status: Draft +Status: Withdrawn Type: Standards Track Created: 18-Mar-2001 Python-Version: 2.1 From python-checkins at python.org Wed May 3 06:44:17 2006 From: python-checkins at python.org (neal.norwitz) Date: Wed, 3 May 2006 06:44:17 +0200 (CEST) Subject: [Python-checkins] r45875 - peps/trunk/pep-0000.txt Message-ID: <20060503044417.B109E1E4005@bag.python.org> Author: neal.norwitz Date: Wed May 3 06:44:17 2006 New Revision: 45875 Modified: peps/trunk/pep-0000.txt Log: 243 was withdrawn Modified: peps/trunk/pep-0000.txt ============================================================================== --- peps/trunk/pep-0000.txt (original) +++ peps/trunk/pep-0000.txt Wed May 3 06:44:17 2006 @@ -75,7 +75,6 @@ S 228 Reworking Python's Numeric Model Zadka, GvR S 237 Unifying Long Integers and Integers Zadka, GvR - S 243 Module Repository Upload Mechanism Reifschneider S 256 Docstring Processing System Framework Goodger S 258 Docutils Design Specification Goodger S 267 Optimized Access to Module Namespaces Hylton @@ -192,6 +191,7 @@ SR 239 Adding a Rational Type to Python Craig, Zadka SR 240 Adding a Rational Literal to Python Craig, Zadka SR 242 Numeric Kinds Dubois + SW 243 Module Repository Upload Mechanism Reifschneider SR 244 The `directive' Statement von Loewis SR 245 Python Interface Syntax Pelletier SR 246 Object Adaptation Evans @@ -304,7 +304,7 @@ SR 240 Adding a Rational Literal to Python Craig, Zadka SF 241 Metadata for Python Software Packages Kuchling SR 242 Numeric Kinds Dubois - S 243 Module Repository Upload Mechanism Reifschneider + SW 243 Module Repository Upload Mechanism Reifschneider SR 244 The `directive' Statement von Loewis SR 245 Python Interface Syntax Pelletier SR 246 Object Adaptation Evans From python-checkins at python.org Wed May 3 06:46:15 2006 From: python-checkins at python.org (tim.peters) Date: Wed, 3 May 2006 06:46:15 +0200 (CEST) Subject: [Python-checkins] r45876 - in python/trunk: Doc/lib/sqlite3/adapter_point_1.py Doc/lib/sqlite3/adapter_point_2.py Doc/lib/sqlite3/execute_2.py Doc/lib/sqlite3/execute_3.py Doc/lib/sqlite3/insert_more_people.py Doc/lib/sqlite3/shortcut_methods.py Doc/lib/sqlite3/text_factory.py Lib/test/test_unicode.py Message-ID: <20060503044615.BEABD1E4005@bag.python.org> Author: tim.peters Date: Wed May 3 06:46:14 2006 New Revision: 45876 Modified: python/trunk/Doc/lib/sqlite3/adapter_point_1.py python/trunk/Doc/lib/sqlite3/adapter_point_2.py python/trunk/Doc/lib/sqlite3/execute_2.py python/trunk/Doc/lib/sqlite3/execute_3.py python/trunk/Doc/lib/sqlite3/insert_more_people.py python/trunk/Doc/lib/sqlite3/shortcut_methods.py python/trunk/Doc/lib/sqlite3/text_factory.py python/trunk/Lib/test/test_unicode.py Log: Whitespace normalization. Modified: python/trunk/Doc/lib/sqlite3/adapter_point_1.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/adapter_point_1.py (original) +++ python/trunk/Doc/lib/sqlite3/adapter_point_1.py Wed May 3 06:46:14 2006 @@ -14,4 +14,3 @@ p = Point(4.0, -3.2) cur.execute("select ?", (p,)) print cur.fetchone()[0] - Modified: python/trunk/Doc/lib/sqlite3/adapter_point_2.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/adapter_point_2.py (original) +++ python/trunk/Doc/lib/sqlite3/adapter_point_2.py Wed May 3 06:46:14 2006 @@ -15,4 +15,3 @@ p = Point(4.0, -3.2) cur.execute("select ?", (p,)) print cur.fetchone()[0] - Modified: python/trunk/Doc/lib/sqlite3/execute_2.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/execute_2.py (original) +++ python/trunk/Doc/lib/sqlite3/execute_2.py Wed May 3 06:46:14 2006 @@ -10,4 +10,3 @@ cur.execute("select name_last, age from people where name_last=:who and age=:age", {"who": who, "age": age}) print cur.fetchone() - Modified: python/trunk/Doc/lib/sqlite3/execute_3.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/execute_3.py (original) +++ python/trunk/Doc/lib/sqlite3/execute_3.py Wed May 3 06:46:14 2006 @@ -10,5 +10,3 @@ cur.execute("select name_last, age from people where name_last=:who and age=:age", locals()) print cur.fetchone() - - Modified: python/trunk/Doc/lib/sqlite3/insert_more_people.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/insert_more_people.py (original) +++ python/trunk/Doc/lib/sqlite3/insert_more_people.py Wed May 3 06:46:14 2006 @@ -14,4 +14,3 @@ # The changes will not be saved unless the transaction is committed explicitly: con.commit() - Modified: python/trunk/Doc/lib/sqlite3/shortcut_methods.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/shortcut_methods.py (original) +++ python/trunk/Doc/lib/sqlite3/shortcut_methods.py Wed May 3 06:46:14 2006 @@ -1,22 +1,21 @@ -import sqlite3 - -persons = [ - ("Hugo", "Boss"), - ("Calvin", "Klein") - ] - -con = sqlite3.connect(":memory:") - -# Create the table -con.execute("create table person(firstname, lastname)") - -# Fill the table -con.executemany("insert into person(firstname, lastname) values (?, ?)", persons) - -# Print the table contents -for row in con.execute("select firstname, lastname from person"): - print row - -# Using a dummy WHERE clause to not let SQLite take the shortcut table deletes. -print "I just deleted", con.execute("delete from person where 1=1").rowcount, "rows" - +import sqlite3 + +persons = [ + ("Hugo", "Boss"), + ("Calvin", "Klein") + ] + +con = sqlite3.connect(":memory:") + +# Create the table +con.execute("create table person(firstname, lastname)") + +# Fill the table +con.executemany("insert into person(firstname, lastname) values (?, ?)", persons) + +# Print the table contents +for row in con.execute("select firstname, lastname from person"): + print row + +# Using a dummy WHERE clause to not let SQLite take the shortcut table deletes. +print "I just deleted", con.execute("delete from person where 1=1").rowcount, "rows" Modified: python/trunk/Doc/lib/sqlite3/text_factory.py ============================================================================== --- python/trunk/Doc/lib/sqlite3/text_factory.py (original) +++ python/trunk/Doc/lib/sqlite3/text_factory.py Wed May 3 06:46:14 2006 @@ -1,43 +1,42 @@ -import sqlite3 - -con = sqlite3.connect(":memory:") -cur = con.cursor() - -# Create the table -con.execute("create table person(lastname, firstname)") - -AUSTRIA = u"\xd6sterreich" - -# by default, rows are returned as Unicode -cur.execute("select ?", (AUSTRIA,)) -row = cur.fetchone() -assert row[0] == AUSTRIA - -# but we can make pysqlite always return bytestrings ... -con.text_factory = str -cur.execute("select ?", (AUSTRIA,)) -row = cur.fetchone() -assert type(row[0]) == str -# the bytestrings will be encoded in UTF-8, unless you stored garbage in the -# database ... -assert row[0] == AUSTRIA.encode("utf-8") - -# we can also implement a custom text_factory ... -# here we implement one that will ignore Unicode characters that cannot be -# decoded from UTF-8 -con.text_factory = lambda x: unicode(x, "utf-8", "ignore") -cur.execute("select ?", ("this is latin1 and would normally create errors" + u"\xe4\xf6\xfc".encode("latin1"),)) -row = cur.fetchone() -assert type(row[0]) == unicode - -# pysqlite offers a builtin optimized text_factory that will return bytestring -# objects, if the data is in ASCII only, and otherwise return unicode objects -con.text_factory = sqlite3.OptimizedUnicode -cur.execute("select ?", (AUSTRIA,)) -row = cur.fetchone() -assert type(row[0]) == unicode - -cur.execute("select ?", ("Germany",)) -row = cur.fetchone() -assert type(row[0]) == str - +import sqlite3 + +con = sqlite3.connect(":memory:") +cur = con.cursor() + +# Create the table +con.execute("create table person(lastname, firstname)") + +AUSTRIA = u"\xd6sterreich" + +# by default, rows are returned as Unicode +cur.execute("select ?", (AUSTRIA,)) +row = cur.fetchone() +assert row[0] == AUSTRIA + +# but we can make pysqlite always return bytestrings ... +con.text_factory = str +cur.execute("select ?", (AUSTRIA,)) +row = cur.fetchone() +assert type(row[0]) == str +# the bytestrings will be encoded in UTF-8, unless you stored garbage in the +# database ... +assert row[0] == AUSTRIA.encode("utf-8") + +# we can also implement a custom text_factory ... +# here we implement one that will ignore Unicode characters that cannot be +# decoded from UTF-8 +con.text_factory = lambda x: unicode(x, "utf-8", "ignore") +cur.execute("select ?", ("this is latin1 and would normally create errors" + u"\xe4\xf6\xfc".encode("latin1"),)) +row = cur.fetchone() +assert type(row[0]) == unicode + +# pysqlite offers a builtin optimized text_factory that will return bytestring +# objects, if the data is in ASCII only, and otherwise return unicode objects +con.text_factory = sqlite3.OptimizedUnicode +cur.execute("select ?", (AUSTRIA,)) +row = cur.fetchone() +assert type(row[0]) == unicode + +cur.execute("select ?", ("Germany",)) +row = cur.fetchone() +assert type(row[0]) == str Modified: python/trunk/Lib/test/test_unicode.py ============================================================================== --- python/trunk/Lib/test/test_unicode.py (original) +++ python/trunk/Lib/test/test_unicode.py Wed May 3 06:46:14 2006 @@ -410,7 +410,7 @@ def __str__(self): return u'\u1234' self.assertEqual('%s' % Wrapper(), u'\u1234') - + @test_support.run_with_locale('LC_ALL', 'de_DE', 'fr_FR') def test_format_float(self): # should not format with a comma, but always with C locale From python-checkins at python.org Wed May 3 06:52:06 2006 From: python-checkins at python.org (martin.v.loewis) Date: Wed, 3 May 2006 06:52:06 +0200 (CEST) Subject: [Python-checkins] r45877 - python/trunk/Doc/lib/libmsilib.tex Message-ID: <20060503045206.37D3C1E4005@bag.python.org> Author: martin.v.loewis Date: Wed May 3 06:52:04 2006 New Revision: 45877 Modified: python/trunk/Doc/lib/libmsilib.tex Log: Correct some formulations, fix XXX comments. Modified: python/trunk/Doc/lib/libmsilib.tex ============================================================================== --- python/trunk/Doc/lib/libmsilib.tex (original) +++ python/trunk/Doc/lib/libmsilib.tex Wed May 3 06:52:04 2006 @@ -33,7 +33,7 @@ be a list of tuples, each containing the name of the file on disk, and the name of the file inside the CAB file. - The files are added to the CAB file in the order they have + The files are added to the CAB file in the order they appear in the list. All files are added into a single CAB file, using the MSZIP compression algorithm. @@ -99,8 +99,7 @@ listing all tables for which content should be added, and one attribute per table that has the actual content. - This is typically used to install the sequence - % XXX unfinished sentence + This is typically used to install the sequence tables. \end{funcdesc} \begin{funcdesc}{add_stream}{database, name, path} @@ -293,7 +292,7 @@ \subsection{Directory Objects\label{msi-directory}} \begin{classdesc}{Directory}{database, cab, basedir, physical, - logical, default, component, \optional{flags}} + logical, default, component, \optional{componentflags}} Create a new directory in the Directory table. There is a current component at each point in time for the directory, which is either explicitly created through \method{start_component}, or implicitly when files @@ -301,9 +300,8 @@ component, and into the cab file. To create a directory, a base directory object needs to be specified (can be \code{None}), the path to the physical directory, and a logical directory name. \var{default} - specifies the DefaultDir slot in the directory table. componentflags + specifies the DefaultDir slot in the directory table. \var{componentflags} specifies the default flags that new components get. - % XXX signature says 'component', 'flags'; text says 'componentflags'. \end{classdesc} \begin{methoddesc}[Directory]{start_component}{\optional{component\optional{, @@ -484,4 +482,4 @@ \begin{datadesc}{text} This module contains definitions for the UIText and ActionText tables, for the standard installer actions. -\end{datadesc} \ No newline at end of file +\end{datadesc} From python-checkins at python.org Wed May 3 06:59:03 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 06:59:03 +0200 (CEST) Subject: [Python-checkins] r45878 - peps/trunk/pep-3099.txt Message-ID: <20060503045903.2D4371E4005@bag.python.org> Author: georg.brandl Date: Wed May 3 06:58:59 2006 New Revision: 45878 Modified: peps/trunk/pep-3099.txt Log: No no reusing loop variables. Modified: peps/trunk/pep-3099.txt ============================================================================== --- peps/trunk/pep-3099.txt (original) +++ peps/trunk/pep-3099.txt Wed May 3 06:58:59 2006 @@ -60,6 +60,12 @@ Thread: Future of slices http://mail.python.org/pipermail/python-3000/2006-May/001563.html +* It will not be forbidden to reuse a loop variable inside the loop's + suite. + + Thread: elimination of scope bleeding of iteration variables + http://mail.python.org/pipermail/python-dev/2006-May/064761.html + Builtins ======== From python-checkins at python.org Wed May 3 07:05:03 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 07:05:03 +0200 (CEST) Subject: [Python-checkins] r45879 - python/trunk/Lib/urllib2.py Message-ID: <20060503050503.A1E611E4005@bag.python.org> Author: georg.brandl Date: Wed May 3 07:05:02 2006 New Revision: 45879 Modified: python/trunk/Lib/urllib2.py Log: Patch #1480067: don't redirect HTTP digest auth in urllib2 Modified: python/trunk/Lib/urllib2.py ============================================================================== --- python/trunk/Lib/urllib2.py (original) +++ python/trunk/Lib/urllib2.py Wed May 3 07:05:02 2006 @@ -858,7 +858,7 @@ auth_val = 'Digest %s' % auth if req.headers.get(self.auth_header, None) == auth_val: return None - req.add_header(self.auth_header, auth_val) + req.add_unredirected_header(self.auth_header, auth_val) resp = self.parent.open(req) return resp From python-checkins at python.org Wed May 3 07:05:09 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 07:05:09 +0200 (CEST) Subject: [Python-checkins] r45880 - python/branches/release24-maint/Lib/urllib2.py Message-ID: <20060503050509.09B4A1E4012@bag.python.org> Author: georg.brandl Date: Wed May 3 07:05:08 2006 New Revision: 45880 Modified: python/branches/release24-maint/Lib/urllib2.py Log: Patch #1480067: don't redirect HTTP digest auth in urllib2 (backport from rev. 45879) Modified: python/branches/release24-maint/Lib/urllib2.py ============================================================================== --- python/branches/release24-maint/Lib/urllib2.py (original) +++ python/branches/release24-maint/Lib/urllib2.py Wed May 3 07:05:08 2006 @@ -815,7 +815,7 @@ auth_val = 'Digest %s' % auth if req.headers.get(self.auth_header, None) == auth_val: return None - req.add_header(self.auth_header, auth_val) + req.add_unredirected_header(self.auth_header, auth_val) resp = self.parent.open(req) return resp From python-checkins at python.org Wed May 3 07:15:12 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 07:15:12 +0200 (CEST) Subject: [Python-checkins] r45881 - python/trunk/Lib/test/test_urllib2.py python/trunk/Lib/test/test_urllib2net.py Message-ID: <20060503051512.17EF31E4005@bag.python.org> Author: georg.brandl Date: Wed May 3 07:15:10 2006 New Revision: 45881 Modified: python/trunk/Lib/test/test_urllib2.py python/trunk/Lib/test/test_urllib2net.py Log: Move network tests from test_urllib2 to test_urllib2net. Modified: python/trunk/Lib/test/test_urllib2.py ============================================================================== --- python/trunk/Lib/test/test_urllib2.py (original) +++ python/trunk/Lib/test/test_urllib2.py Wed May 3 07:15:10 2006 @@ -857,138 +857,6 @@ else: self.assert_(False) -class NetworkTests(unittest.TestCase): - def setUp(self): - if 0: # for debugging - import logging - logger = logging.getLogger("test_urllib2") - logger.addHandler(logging.StreamHandler()) - - def test_range (self): - req = urllib2.Request("http://www.python.org", - headers={'Range': 'bytes=20-39'}) - result = urllib2.urlopen(req) - data = result.read() - self.assertEqual(len(data), 20) - - # XXX The rest of these tests aren't very good -- they don't check much. - # They do sometimes catch some major disasters, though. - - def test_ftp(self): - urls = [ - 'ftp://www.python.org/pub/python/misc/sousa.au', - 'ftp://www.python.org/pub/tmp/blat', - 'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC' - '/research-reports/00README-Legal-Rules-Regs', - ] - self._test_urls(urls, self._extra_handlers()) - - def test_gopher(self): - import warnings - warnings.filterwarnings("ignore", - "the gopherlib module is deprecated", - DeprecationWarning, - "urllib2$") - urls = [ - # Thanks to Fred for finding these! - 'gopher://gopher.lib.ncsu.edu/11/library/stacks/Alex', - 'gopher://gopher.vt.edu:10010/10/33', - ] - self._test_urls(urls, self._extra_handlers()) - - def test_file(self): - TESTFN = test_support.TESTFN - f = open(TESTFN, 'w') - try: - f.write('hi there\n') - f.close() - urls = [ - 'file:'+sanepathname2url(os.path.abspath(TESTFN)), - - # XXX bug, should raise URLError - #('file://nonsensename/etc/passwd', None, urllib2.URLError) - ('file://nonsensename/etc/passwd', None, (OSError, socket.error)) - ] - self._test_urls(urls, self._extra_handlers()) - finally: - os.remove(TESTFN) - - def test_http(self): - urls = [ - 'http://www.espn.com/', # redirect - 'http://www.python.org/Spanish/Inquistion/', - ('http://www.python.org/cgi-bin/faqw.py', - 'query=pythonistas&querytype=simple&casefold=yes&req=search', None), - 'http://www.python.org/', - ] - self._test_urls(urls, self._extra_handlers()) - - # XXX Following test depends on machine configurations that are internal - # to CNRI. Need to set up a public server with the right authentication - # configuration for test purposes. - -## def test_cnri(self): -## if socket.gethostname() == 'bitdiddle': -## localhost = 'bitdiddle.cnri.reston.va.us' -## elif socket.gethostname() == 'bitdiddle.concentric.net': -## localhost = 'localhost' -## else: -## localhost = None -## if localhost is not None: -## urls = [ -## 'file://%s/etc/passwd' % localhost, -## 'http://%s/simple/' % localhost, -## 'http://%s/digest/' % localhost, -## 'http://%s/not/found.h' % localhost, -## ] - -## bauth = HTTPBasicAuthHandler() -## bauth.add_password('basic_test_realm', localhost, 'jhylton', -## 'password') -## dauth = HTTPDigestAuthHandler() -## dauth.add_password('digest_test_realm', localhost, 'jhylton', -## 'password') - -## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) - - def _test_urls(self, urls, handlers): - import socket - import time - import logging - debug = logging.getLogger("test_urllib2").debug - - urllib2.install_opener(urllib2.build_opener(*handlers)) - - for url in urls: - if isinstance(url, tuple): - url, req, expected_err = url - else: - req = expected_err = None - debug(url) - try: - f = urllib2.urlopen(url, req) - except (IOError, socket.error, OSError), err: - debug(err) - if expected_err: - self.assert_(isinstance(err, expected_err)) - else: - buf = f.read() - f.close() - debug("read %d bytes" % len(buf)) - debug("******** next url coming up...") - time.sleep(0.1) - - def _extra_handlers(self): - handlers = [] - - handlers.append(urllib2.GopherHandler) - - cfh = urllib2.CacheFTPHandler() - cfh.setTimeout(1) - handlers.append(cfh) - - return handlers - def test_main(verbose=None): from test import test_urllib2 @@ -998,8 +866,6 @@ OpenerDirectorTests, HandlerTests, MiscTests) - if test_support.is_resource_enabled('network'): - tests += (NetworkTests,) test_support.run_unittest(*tests) if __name__ == "__main__": Modified: python/trunk/Lib/test/test_urllib2net.py ============================================================================== --- python/trunk/Lib/test/test_urllib2net.py (original) +++ python/trunk/Lib/test/test_urllib2net.py Wed May 3 07:15:10 2006 @@ -2,6 +2,7 @@ import unittest from test import test_support +from test.test_urllib2 import sanepathname2url import socket import urllib2 @@ -124,10 +125,145 @@ # urllib2.urlopen, "http://www.sadflkjsasadf.com/") urllib2.urlopen, "http://www.python.invalid/") + +class OtherNetworkTests(unittest.TestCase): + def setUp(self): + if 0: # for debugging + import logging + logger = logging.getLogger("test_urllib2net") + logger.addHandler(logging.StreamHandler()) + + def test_range (self): + req = urllib2.Request("http://www.python.org", + headers={'Range': 'bytes=20-39'}) + result = urllib2.urlopen(req) + data = result.read() + self.assertEqual(len(data), 20) + + # XXX The rest of these tests aren't very good -- they don't check much. + # They do sometimes catch some major disasters, though. + + def test_ftp(self): + urls = [ + 'ftp://www.python.org/pub/python/misc/sousa.au', + 'ftp://www.python.org/pub/tmp/blat', + 'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC' + '/research-reports/00README-Legal-Rules-Regs', + ] + self._test_urls(urls, self._extra_handlers()) + + def test_gopher(self): + import warnings + warnings.filterwarnings("ignore", + "the gopherlib module is deprecated", + DeprecationWarning, + "urllib2$") + urls = [ + # Thanks to Fred for finding these! + 'gopher://gopher.lib.ncsu.edu/11/library/stacks/Alex', + 'gopher://gopher.vt.edu:10010/10/33', + ] + self._test_urls(urls, self._extra_handlers()) + + def test_file(self): + TESTFN = test_support.TESTFN + f = open(TESTFN, 'w') + try: + f.write('hi there\n') + f.close() + urls = [ + 'file:'+sanepathname2url(os.path.abspath(TESTFN)), + + # XXX bug, should raise URLError + #('file://nonsensename/etc/passwd', None, urllib2.URLError) + ('file://nonsensename/etc/passwd', None, (OSError, socket.error)) + ] + self._test_urls(urls, self._extra_handlers()) + finally: + os.remove(TESTFN) + + def test_http(self): + urls = [ + 'http://www.espn.com/', # redirect + 'http://www.python.org/Spanish/Inquistion/', + ('http://www.python.org/cgi-bin/faqw.py', + 'query=pythonistas&querytype=simple&casefold=yes&req=search', None), + 'http://www.python.org/', + ] + self._test_urls(urls, self._extra_handlers()) + + # XXX Following test depends on machine configurations that are internal + # to CNRI. Need to set up a public server with the right authentication + # configuration for test purposes. + +## def test_cnri(self): +## if socket.gethostname() == 'bitdiddle': +## localhost = 'bitdiddle.cnri.reston.va.us' +## elif socket.gethostname() == 'bitdiddle.concentric.net': +## localhost = 'localhost' +## else: +## localhost = None +## if localhost is not None: +## urls = [ +## 'file://%s/etc/passwd' % localhost, +## 'http://%s/simple/' % localhost, +## 'http://%s/digest/' % localhost, +## 'http://%s/not/found.h' % localhost, +## ] + +## bauth = HTTPBasicAuthHandler() +## bauth.add_password('basic_test_realm', localhost, 'jhylton', +## 'password') +## dauth = HTTPDigestAuthHandler() +## dauth.add_password('digest_test_realm', localhost, 'jhylton', +## 'password') + +## self._test_urls(urls, self._extra_handlers()+[bauth, dauth]) + + def _test_urls(self, urls, handlers): + import socket + import time + import logging + debug = logging.getLogger("test_urllib2").debug + + urllib2.install_opener(urllib2.build_opener(*handlers)) + + for url in urls: + if isinstance(url, tuple): + url, req, expected_err = url + else: + req = expected_err = None + debug(url) + try: + f = urllib2.urlopen(url, req) + except (IOError, socket.error, OSError), err: + debug(err) + if expected_err: + self.assert_(isinstance(err, expected_err)) + else: + buf = f.read() + f.close() + debug("read %d bytes" % len(buf)) + debug("******** next url coming up...") + time.sleep(0.1) + + def _extra_handlers(self): + handlers = [] + + handlers.append(urllib2.GopherHandler) + + cfh = urllib2.CacheFTPHandler() + cfh.setTimeout(1) + handlers.append(cfh) + + return handlers + + + def test_main(): test_support.requires("network") test_support.run_unittest(URLTimeoutTest, urlopenNetworkTests, - AuthTests) + AuthTests, OtherNetworkTests) if __name__ == "__main__": test_main() From python-checkins at python.org Wed May 3 07:17:37 2006 From: python-checkins at python.org (guido.van.rossum) Date: Wed, 3 May 2006 07:17:37 +0200 (CEST) Subject: [Python-checkins] r45882 - sandbox/trunk/sio/io.py sandbox/trunk/sio/test_io.py Message-ID: <20060503051737.7E9D41E4005@bag.python.org> Author: guido.van.rossum Date: Wed May 3 07:17:37 2006 New Revision: 45882 Added: sandbox/trunk/sio/test_io.py (contents, props changed) Modified: sandbox/trunk/sio/io.py Log: Some progress -- now using TDD. Modified: sandbox/trunk/sio/io.py ============================================================================== --- sandbox/trunk/sio/io.py (original) +++ sandbox/trunk/sio/io.py Wed May 3 07:17:37 2006 @@ -93,20 +93,34 @@ """A binary file using I/O on Unix file descriptors.""" - def __init__(self, fd): + def __init__(self, fd, __more=None, + readable=True, writable=False, + seekable=False, truncatable=False): + if __more is not None: + raise TypeError("only one positional argument is allowed") self._fd = fd + self._readable = readable + self._writable = writable + self._seekable = seekable + self._truncatable = truncatable + + def close(self): + fd = self._fd + self._fd = None + if fd is not None: + os.close(fd) def readable(self): - return True # May be a lie -- but how to tell the mode? + return self._readable def writable(self): - return True # May be a lie -- but how to tell the mode? + return self._writable def seekable(self): - return True # May be a lie -- but how to tell the mode? + return self._seekable def truncatable(self): - return True # May be a lie -- but how to tell the mode? + return self._truncatable def read(self, n): b = os.read(self._fd, n) @@ -128,7 +142,7 @@ os.ftruncate(self._fd, offset) return os.lseek(self._fd, 0, 2) - # XXX ioctl, fcntl? What else? + # XXX ioctl? fcntl? isatty? fileno? What else? class BufferingBinaryFileWrapper: @@ -164,13 +178,32 @@ # else: # self._buffer[self._bufptr : ] = data to be read + def close(self): + file = self._file + if file is not None: + self.flush() + self._file = None + file.close() + + def readable(self): + return self._file.readable() + + def writable(self): + return self._file.writable() + + def seekable(self): + return self._file.seekable() + + def truncatable(self): + return self._file.truncatable() + def flush(self): if self._writing: start = 0 while start < self._bufptr: start += self._file.write(self._buffer[start : self._bufptr]) self._bufptr = 0 - elif self._bufptr < len(self._buffer): + elif self._bufptr < len(self._buffer) and self._file.seekable(): self._file.seek(self._bufptr - len(self._buffer), 1) self._buffer = bytes() self._bufptr = 0 @@ -224,22 +257,66 @@ self._buffer = bytes(self._bufsize) if self._bufptr + len(b) < len(self._buffer): self._buffer[self._bufptr : self._bufptr + len(b)] = b + self._bufptr += len(b) elif self._bufptr + len(b) == len(self._buffer): self._buffer[self._bufptr : ] = b + self._bufptr = len(self._buffer) self.flush() else: n = len(self._buffer) - self._bufptr self._buffer[self._bufptr : ] = b[ : n] + self._bufptr = len(self._buffer) self.flush() - self._bufptr[ : len(b) - n] = b[n : ] + self._buffer[ : len(b) - n] = b[n : ] self._bufptr = len(b) - n + def seek(self, pos, whence=0): + if not self._file.seekable(): + raise IOError("file is not seekable") + # XXX Optimize this for seeks while reading within the buffer? + self.flush() + self._file.seek(pos, whence) + + def tell(self): + if not self._file.seekable(): + raise IOError("file is not seekable") + pos = self._file.tell() + if self._writing: + pos += self._bufptr + else: + pos += self._bufptr - len(self._buffer) + return pos -def main(): - import sys - fd = sys.stdout.fileno() - f = OSBinaryFile(fd) - f.write(bytes(u"hello world\n", "ascii")) + def truncate(self, pos): + if not self._file.truncatable(): + raise IOError("file is not truncatable") + self.flush() + return self._file.truncate(pos) -if __name__ == "__main__": - main() + +def open(filename, mode, bufsize=DEFAULT_BUFSIZE): + """Return an open file object. + + This is a versatile factory function that can open binary and text + files for reading and writing. + + """ + if mode not in ("rb", "wb"): + raise ValueError("unrecognized mode: %r" % (mode,)) + flags = getattr(os, "O_BINARY", 0) + readable = writable = False + if mode == "rb": + flags |= os.O_RDONLY + readable = True + else: + flags |= os.O_WRONLY | os.O_TRUNC | os.O_CREAT + writable = True + fd = os.open(filename, flags, 0666) + file = OSBinaryFile(fd, + readable=readable, + writable=writable, + seekable=True, + truncatable=hasattr(os, "ftruncate")) + if bufsize != 0: + file = BufferingBinaryFileWrapper(file, bufsize) + return file Added: sandbox/trunk/sio/test_io.py ============================================================================== --- (empty file) +++ sandbox/trunk/sio/test_io.py Wed May 3 07:17:37 2006 @@ -0,0 +1,92 @@ +#!/usr/bin/env python3.0 + +"""Unit tests for io.py.""" + +import os +import shutil +import tempfile +import unittest + +import io # Local + + +class IOTestCase(unittest.TestCase): + + def setUp(self): + self.tfn = tempfile.mktemp() + + def tearDown(self): + if os.path.exists(self.tfn): + os.remove(self.tfn) + + def test_unbuffered(self): + sample1 = bytes("hello ") + sample2 = bytes("world\n") + f = io.open(self.tfn, "wb", 0) + try: + f.write(sample1) + f.write(sample2) + finally: + f.close() + + f = open(self.tfn) # Classic open! + try: + data = f.read() + finally: + f.close() + self.assertEquals(bytes(data), sample1+sample2) + + f = io.open(self.tfn, "rb", 0) + try: + data = f.read(1) + self.assertEquals(data, sample1[:1]) + self.assertEquals(f.tell(), 1) + f.seek(0) + self.assertEquals(f.tell(), 0) + data = f.read(len(sample1)) + self.assertEquals(data, sample1) + data += f.read(100) + self.assertEquals(data, sample1+sample2) + finally: + f.close() + + def test_buffered_read(self): + sample1 = bytes("hello ") + sample2 = bytes("world\n") + for bufsize in 1, 2, 3, 4, 5, 6, 7, 8, 16, 8*1024: + f = io.open(self.tfn, "wb", bufsize) + try: + f.write(sample1) + f.write(sample2) + finally: + f.close() + + f = open(self.tfn) # Classic open! + try: + data = f.read() + finally: + f.close() + self.assertEquals(bytes(data), sample1+sample2, + "%r != %r, bufsize=%s" % (bytes(data), + sample1+sample2, + bufsize)) + + f = io.open(self.tfn, "rb", bufsize) + try: + data = f.read(1) + self.assertEquals(data, sample1[:1]) + self.assertEquals(f.tell(), 1) + f.seek(0) + self.assertEquals(f.tell(), 0) + data = f.read(len(sample1)) + self.assertEquals(data, sample1) + data += f.read(100) + self.assertEquals(data, sample1+sample2) + finally: + f.close() + + os.remove(self.tfn) + + +if __name__ == "__main__": + unittest.main() From nnorwitz at gmail.com Wed May 3 07:56:26 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Tue, 2 May 2006 22:56:26 -0700 Subject: [Python-checkins] r45862 - in python/trunk: Doc/lib/libcontextlib.tex Doc/ref/ref3.tex Doc/ref/ref7.tex Lib/calendar.py Lib/compiler/pycodegen.py Lib/contextlib.py Lib/decimal.py Lib/dummy_thread.py Lib/test/test_contextlib.py Lib/test/test_with. Message-ID: I wonder if get_manager() would be a better method name. At least this: with decimal.ExtendedContext.get_manager(): reads better to me since context is not duplicated. n -- > Modified: python/trunk/Lib/decimal.py > ============================================================================== > --- python/trunk/Lib/decimal.py (original) > +++ python/trunk/Lib/decimal.py Tue May 2 21:47:52 2006 > @@ -2248,7 +2248,7 @@ > s.append('traps=[' + ', '.join([t.__name__ for t, v in self.traps.items() if v]) + ']') > return ', '.join(s) + ')' > > - def __context__(self): > + def context_manager(self): > return WithStatementContext(self.copy()) > > def clear_flags(self): > > Modified: python/trunk/Lib/test/test_contextlib.py > ============================================================================== > --- python/trunk/Lib/test/test_contextlib.py (original) > +++ python/trunk/Lib/test/test_contextlib.py Tue May 2 21:47:52 2006 > @@ -341,12 +339,12 @@ > orig_context = ctx.copy() > try: > ctx.prec = save_prec = decimal.ExtendedContext.prec + 5 > - with decimal.ExtendedContext: > + with decimal.ExtendedContext.context_manager(): > self.assertEqual(decimal.getcontext().prec, > decimal.ExtendedContext.prec) > self.assertEqual(decimal.getcontext().prec, save_prec) > try: > - with decimal.ExtendedContext: > + with decimal.ExtendedContext.context_manager(): > self.assertEqual(decimal.getcontext().prec, > decimal.ExtendedContext.prec) > 1/0 > From python-checkins at python.org Wed May 3 09:45:57 2006 From: python-checkins at python.org (richard.tew) Date: Wed, 3 May 2006 09:45:57 +0200 (CEST) Subject: [Python-checkins] r45883 - stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Message-ID: <20060503074557.C4AB51E4005@bag.python.org> Author: richard.tew Date: Wed May 3 09:45:56 2006 New Revision: 45883 Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Log: Fixed the MASM __return definition. I am adapting this #ifdef block for the arm assembler slp_switch I am writing, and noticed that the two statements in the __return define were not enclosed in a block, so polluted where they were expanded so the code would always return after that point. Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c (original) +++ stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Wed May 3 09:45:56 2006 @@ -47,7 +47,7 @@ #define STACK_MAGIC 0 #undef __return -#define __return(x) exitcode = x; goto exit; +#define __return(x) { exitcode = x; goto exit; } int slp_save_state(intptr_t *stack){ int exitcode; From python-checkins at python.org Wed May 3 11:41:55 2006 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 May 2006 11:41:55 +0200 (CEST) Subject: [Python-checkins] r45884 - peps/trunk/pep-0343.txt Message-ID: <20060503094155.730071E400B@bag.python.org> Author: nick.coghlan Date: Wed May 3 11:41:53 2006 New Revision: 45884 Modified: peps/trunk/pep-0343.txt Log: Address some comments from Guido by cutting back on the overengineering in the terminology section. Also a few minor grammar cleanups and fixes I missed last night. Modified: peps/trunk/pep-0343.txt ============================================================================== --- peps/trunk/pep-0343.txt (original) +++ peps/trunk/pep-0343.txt Wed May 3 11:41:53 2006 @@ -15,8 +15,8 @@ it possible to factor out standard uses of try/finally statements. In this PEP, context managers provide __enter__() and __exit__() - methods that are invoked on entry to and exit from the managed - context that forms the body of the with statement. + methods that are invoked on entry to and exit from the body of the + with statement. Author's Note @@ -50,8 +50,8 @@ [2] and universally approved of. I'm also changing the keyword to 'with'. - Following acceptance of this PEP, the following PEPs have been - rejected due to overlap: + After acceptance of this PEP, the following PEPs were rejected due + to overlap: - PEP 310, Reliable Acquisition/Release Pairs. This is the original with-statement proposal. @@ -469,37 +469,29 @@ and that objects that implement that protocol be known as "context managers". [4] - The code in the body of the with statement is a "managed context". - This term refers primarily to the code location, rather than to the - runtime environment established by the context manager. - The expression immediately following the with keyword in the statement is a "context expression" as that expression provides the main clue as to the runtime environment the context manager - establishes for the duration of the managed context. + establishes for the duration of the statement body. - The value assigned to the target list after the as keyword is the - "context entry value", as that value is returned as the result of - entering the context. - - These terms are based on the idea that the context expression - provides a context manager to appropriately handle entry into the - managed context. The context manager may also provide a meaningful - context entry value and perform clean up operations on exit from - the managed context. - - The general term "context" is unfortunately ambiguous. If necessary, - it can be made more explicit by using the terms "context manager" - for the concrete object created by the context expression, - "managed context" for the code in the body of the with statement, - and "runtime context" or (preferebly) "runtime environment" for the - actual state modifications made by the context manager. When solely - discussing use of the with statement, the distinction between these - shouldn't matter too much as the context manager fully defines the - changes made to the runtime environment, and those changes apply for - the duration of the managed context. The distinction is more - important when discussing the process of implementing context - managers and the mechanics of the with statement itself. + The code in the body of the with statement and the variable name + (or names) after the as keyword don't really have special terms at + this point in time. The general terms "statement body" and "target + list" can be used, prefixing with "with" or "with statement" if the + terms would otherwise be unclear. + + Given the existence of objects such as the decimal module's + arithmetic context, a term "context" is unfortunately ambiguous. + If necessary, it can be made more specific by using the terms + "context manager" for the concrete object created by the context + expression and "runtime context" or (preferably) "runtime + environment" for the actual state modifications made by the context + manager. When simply discussing use of the with statement, the + ambiguity shouldn't matter too much as the context expression fully + defines the changes made to the runtime environment. + The distinction is more important when discussing the mechanics of + the with statement itself and how to go about actually implementing + context managers. Caching Context Managers @@ -531,7 +523,7 @@ 1. Greg Ewing raised the question of whether or not the term "context manager" was too generic and suggested "context guard" - as an alternative name. + as an alternative name. [16] 2. In Python 2.5a2, the decorator in contextlib to create a context manager from a generator function is called @@ -594,9 +586,9 @@ Examples The generator based examples rely on PEP 342. Also, some of the - examples are likely to be unnecessary in practice, as the - appropriate objects, such as threading.RLock, will be able to be - used directly in with statements. + examples are unnecessary in practice, as the appropriate objects, + such as threading.RLock, are able to be used directly in with + statements. The tense used in the names of the example contexts is not arbitrary. Past tense ("-ed") is used when the name refers to an @@ -755,9 +747,8 @@ # so this must be outside the with-statement: return +s - 9. Here's a proposed context manager for the decimal module: + 9. Here's a simple context manager for the decimal module: - # This would be a new decimal.Context method @contextmanager def localcontext(ctx=None): """Set a new local decimal context for the block""" @@ -906,7 +897,7 @@ This PEP was first accepted by Guido at his EuroPython keynote, 27 June 2005. It was accepted again later, with the __context__ method added. - The PEP was implemented in subversion for Python 2.5a1 + The PEP was implemented in Subversion for Python 2.5a1 The __context__() method will be removed in Python 2.5a3 @@ -970,7 +961,7 @@ [15] Guido kills the __context__() method http://mail.python.org/pipermail/python-dev/2006-April/064632.html - [16] Greg propose 'context guard' instead of 'context manager' + [16] Proposal to use 'context guard' instead of 'context manager' http://mail.python.org/pipermail/python-dev/2006-May/064676.html Copyright From python-checkins at python.org Wed May 3 13:55:31 2006 From: python-checkins at python.org (richard.tew) Date: Wed, 3 May 2006 13:55:31 +0200 (CEST) Subject: [Python-checkins] r45885 - in stackless/Python-2.4.3/dev/Stackless: core/slp_transfer.c platf/slp_platformselect.h platf/switch_arm_thumb_gas.s platf/switch_arm_thumb_gcc.h platf/switch_x64_msvc.h Message-ID: <20060503115531.C4A3F1E400B@bag.python.org> Author: richard.tew Date: Wed May 3 13:55:27 2006 New Revision: 45885 Added: stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gas.s (contents, props changed) stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gcc.h (contents, props changed) Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c stackless/Python-2.4.3/dev/Stackless/platf/slp_platformselect.h stackless/Python-2.4.3/dev/Stackless/platf/switch_x64_msvc.h Log: There were CCP x64/masm specific changes to slp_transfer.c which exposed wrapped versions of the SLP_SAVE_STATE and SLP_RESTORE_STATE macros for the masm assembler version of slp_switch to call. They are now no longer masm specific, and should work for other platform's which have assembler versions of slp_switch (like the arm thumb version which is also added in this change). Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c (original) +++ stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Wed May 3 13:55:27 2006 @@ -41,11 +41,24 @@ slp_cstack_restore(_cst); \ } -// #define USE_MASM // CCP addition, define to use masm code -#ifdef USE_MASM -//ccp addition: make these functions, to be called from assembler -#define STACK_MAGIC 0 +/* This define is no longer needed now? */ +#define SLP_EVAL +#include "platf/slp_platformselect.h" +#ifdef EXTERNAL_ASM +/* CCP addition: Make these functions, to be called from assembler. + * The token include file for the given platform should enable the + * EXTERNAL_ASM define so that this is included. + */ + +/* There are two cases where slp_save_state would return 0, the + * first where there is no difference in where the stack pointer + * should be from where it is now. And the second where + * SLP_SAVE_STATE returns without restoring because we are only + * here to save. The assembler routine needs to differentiate + * between these, which is why we override the returns and flag + * the low bit of the return value on early exit. + */ #undef __return #define __return(x) { exitcode = x; goto exit; } @@ -65,11 +78,6 @@ extern int slp_switch(void); -#else - -#define SLP_EVAL -#include "platf/slp_platformselect.h" - #endif static int Modified: stackless/Python-2.4.3/dev/Stackless/platf/slp_platformselect.h ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/platf/slp_platformselect.h (original) +++ stackless/Python-2.4.3/dev/Stackless/platf/slp_platformselect.h Wed May 3 13:55:27 2006 @@ -20,6 +20,8 @@ #include "switch_s390_unix.h" /* Linux/S390 */ #elif defined(__GNUC__) && defined(__s390x__) && defined(__linux__) #include "switch_s390_unix.h" /* Linux/S390 zSeries (identical) */ +#elif defined(__GNUC__) && defined(__arm__) && defined(__thumb__) +#include "switch_arm_thumb_gcc.h" /* gcc using arm thumb */ #endif /* default definitions if not defined in above files */ Added: stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gas.s ============================================================================== --- (empty file) +++ stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gas.s Wed May 3 13:55:27 2006 @@ -0,0 +1,70 @@ +@ The stack switching logic for the arm thumb instruction set. +@ Written by Richard Tew, 2nd May 2006. +@ +@ It is not possible to do this as inline assembler as gcc generates functions +@ where the stack register is preserved, so any changes we make to it will be +@ discarded. However, any stack copying we have done is left in place, which +@ results in corrupt state. +@ +@ This adapts the MASM approach written by Kristjan Jonsson, where early +@ returns from SLP_SAVE_STATE (within slp_save_state) are flagged by setting +@ the low bit of the return value. This either indicates that there was an +@ error (-1) or that we do not need to restore the stack (1) as we are only +@ here to save the current one. +@ +@ I know little arm thumb assembly, so in case anyone else wants to know the +@ approach I took, I will document it here. The first uncertainty was which +@ registers should be saved. I took this section of code from the assembler +@ generated by gcc with a command line of: +@ gcc -mthumb -S slp_transfer.c +@ where slp_transfer included the inline version of slp_switch for the arm +@ thumb. Another initial uncertainty were the instructions needed to: +@ a) obtain the stack pointer. (mov r0, sp) +@ b) restore the stack pointer. (add sp, sp, r0) +@ which were used in the original inlined assembly. The rest of the code was +@ just patched together based on Kristjan's existing masm source code. + +@ (int) slp_switch (void); + .thumb + .align 2 + .global slp_switch + .type slp_switch, %function @ Apparently useful for .map files. + .thumb_func + +slp_switch: + push {r4, r5, r6, r7, lr} + mov r7, fp + mov r6, sl + mov r5, r9 + mov r4, r8 + push {r4, r5, r6, r7} + + mov r0, sp + bl slp_save_state @ diff = slp_save_state([r0]stackref) + + mov r1, #0 @ r1 = -1 + mvn r1, r1 + + cmp r0, r1 @ if (diff == -1) + beq .exit @ return -1; + + cmp r0, #1 @ if (diff == 1) + beq .no_restore @ return 0; + +.restore: + add sp, sp, r0 @ Adjust the stack pointer for the state we are restoring. + + bl slp_restore_state @ slp_restore_state() + +.no_restore: + mov r0, #0 @ Switch successful (whether we restored or not). + +.exit: + pop {r2, r3, r4, r5} + mov r8, r2 + mov r9, r3 + mov sl, r4 + mov fp, r5 + pop {r4, r5, r6, r7, pc} + + .size slp_switch, .-slp_switch @ Apparently useful for .map files. Added: stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gcc.h ============================================================================== --- (empty file) +++ stackless/Python-2.4.3/dev/Stackless/platf/switch_arm_thumb_gcc.h Wed May 3 13:55:27 2006 @@ -0,0 +1,10 @@ + +#define STACK_REFPLUS 1 +#define STACK_MAGIC 0 + +/* Use the generic support for an external assembly language slp_switch function. */ +#define EXTERNAL_ASM + +#ifdef SLP_EVAL +/* This always uses the external masm assembly file. */ +#endif Modified: stackless/Python-2.4.3/dev/Stackless/platf/switch_x64_msvc.h ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/platf/switch_x64_msvc.h (original) +++ stackless/Python-2.4.3/dev/Stackless/platf/switch_x64_msvc.h Wed May 3 13:55:27 2006 @@ -25,25 +25,13 @@ #define alloca _alloca #define STACK_REFPLUS 1 - -#ifdef SLP_EVAL - #define STACK_MAGIC 0 -extern int slp_switch(void); /* defined in masm assembler */ - -/* These two are called from the assembler module */ -SSIZE_T slp_save_state(intptr_t *ref) { - SSIZE_T diff; - SLP_SAVE_STATE(ref, diff); - return diff; -} - -void slp_restore_state(void) -{ - SLP_RESTORE_STATE(); -} +/* Use the generic support for an external assembly language slp_switch function. */ +#define EXTERNAL_ASM +#ifdef SLP_EVAL +/* This always uses the external masm assembly file. */ #endif /* @@ -62,6 +50,6 @@ int stackref; intptr_t stackbase = ((intptr_t)&stackref) & 0xfffff000; return (intptr_t)p >= stackbase && (intptr_t)p < stackbase + 0x00100000; -} +} #endif From python-checkins at python.org Wed May 3 14:58:00 2006 From: python-checkins at python.org (richard.tew) Date: Wed, 3 May 2006 14:58:00 +0200 (CEST) Subject: [Python-checkins] r45886 - stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Message-ID: <20060503125800.6C1B71E400B@bag.python.org> Author: richard.tew Date: Wed May 3 14:57:59 2006 New Revision: 45886 Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Log: The external asm code handling used SSIZE_T, which is Windows specific. Where this is not defined, int is used instead. Modified: stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c (original) +++ stackless/Python-2.4.3/dev/Stackless/core/slp_transfer.c Wed May 3 14:57:59 2006 @@ -64,7 +64,13 @@ int slp_save_state(intptr_t *stack){ int exitcode; +#ifdef SSIZE_T + /* Only on Windows apparently. */ SSIZE_T diff; +#else + /* Py_ssize_t when we port to 2.5? */ + int diff; +#endif SLP_SAVE_STATE(stack, diff); return diff; exit: From python-checkins at python.org Wed May 3 15:02:57 2006 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 May 2006 15:02:57 +0200 (CEST) Subject: [Python-checkins] r45887 - in python/trunk: Doc/lib/libcontextlib.tex Doc/lib/libstdtypes.tex Doc/ref/ref3.tex Doc/ref/ref7.tex Lib/contextlib.py Lib/decimal.py Lib/test/test_contextlib.py Lib/test/test_with.py Message-ID: <20060503130257.36FD91E400B@bag.python.org> Author: nick.coghlan Date: Wed May 3 15:02:47 2006 New Revision: 45887 Modified: python/trunk/Doc/lib/libcontextlib.tex python/trunk/Doc/lib/libstdtypes.tex python/trunk/Doc/ref/ref3.tex python/trunk/Doc/ref/ref7.tex python/trunk/Lib/contextlib.py python/trunk/Lib/decimal.py python/trunk/Lib/test/test_contextlib.py python/trunk/Lib/test/test_with.py Log: Finish bringing SVN into line with latest version of PEP 343 by getting rid of all remaining references to context objects that I could find. Without a __context__() method context objects no longer exist. Also get test_with working again, and adopt a suggestion from Neal for decimal.Context.get_manager() Modified: python/trunk/Doc/lib/libcontextlib.tex ============================================================================== --- python/trunk/Doc/lib/libcontextlib.tex (original) +++ python/trunk/Doc/lib/libcontextlib.tex Wed May 3 15:02:47 2006 @@ -11,19 +11,20 @@ Functions provided: -\begin{funcdesc}{context}{func} +\begin{funcdesc}{contextmanager}{func} This function is a decorator that can be used to define a factory function for \keyword{with} statement context objects, without needing to create a class or separate \method{__enter__()} and \method{__exit__()} methods. -A simple example: +A simple example (this is not recommended as a real way of +generating HTML!): \begin{verbatim} from __future__ import with_statement -from contextlib import contextfactory +from contextlib import contextmanager - at contextfactory + at contextmanager def tag(name): print "<%s>" % name yield @@ -56,7 +57,7 @@ the statement immediately following the \keyword{with} statement. \end{funcdesc} -\begin{funcdesc}{nested}{ctx1\optional{, ctx2\optional{, ...}}} +\begin{funcdesc}{nested}{mgr1\optional{, mgr2\optional{, ...}}} Combine multiple context managers into a single nested context manager. Code like this: @@ -78,12 +79,12 @@ \end{verbatim} Note that if the \method{__exit__()} method of one of the nested -context objects indicates an exception should be suppressed, no +context managers indicates an exception should be suppressed, no exception information will be passed to any remaining outer context objects. Similarly, if the \method{__exit__()} method of one of the -nested context objects raises an exception, any previous exception +nested context managers raises an exception, any previous exception state will be lost; the new exception will be passed to the -\method{__exit__()} methods of any remaining outer context objects. +\method{__exit__()} methods of any remaining outer context managers. In general, \method{__exit__()} methods should avoid raising exceptions, and in particular they should not re-raise a passed-in exception. @@ -91,13 +92,13 @@ \label{context-closing} \begin{funcdesc}{closing}{thing} -Return a context that closes \var{thing} upon completion of the -block. This is basically equivalent to: +Return a context manager that closes \var{thing} upon completion of +the block. This is basically equivalent to: \begin{verbatim} -from contextlib import contextfactory +from contextlib import contextmanager - at contextfactory + at contextmanager def closing(thing): try: yield thing Modified: python/trunk/Doc/lib/libstdtypes.tex ============================================================================== --- python/trunk/Doc/lib/libstdtypes.tex (original) +++ python/trunk/Doc/lib/libstdtypes.tex Wed May 3 15:02:47 2006 @@ -1753,67 +1753,50 @@ \end{memberdesc} -\subsection{Context Types \label{typecontext}} +\subsection{Context Manager Types \label{typecontextmanager}} \versionadded{2.5} -\index{with statement context protocol} +\index{context manager} \index{context management protocol} -\index{protocol!with statement context} \index{protocol!context management} Python's \keyword{with} statement supports the concept of a runtime context defined by a context manager. This is implemented using -three distinct methods; these are used to allow user-defined -classes to define a runtime context. +two separate methods that allow user-defined classes to define +a runtime context that is entered before the statement body is +executed and exited when the statement ends. -The \dfn{context management protocol} consists of a single -method that needs to be provided for a context manager object to +The \dfn{context management protocol} consists of a pair of +methods that need to be provided for a context manager object to define a runtime context: -\begin{methoddesc}[context manager]{__context__}{} - Return a with statement context object. The object is required to - support the with statement context protocol described below. If an - object supports different kinds of runtime context, additional - methods can be provided to specifically request context objects for - those kinds of runtime context. (An example of an object supporting - multiple kinds of context would be a synchronisation object which - supported both a locked context for normal thread synchronisation - and an unlocked context to temporarily release a held lock while - performing a potentially long running operation) -\end{methoddesc} - -The with statement context objects themselves are required to support the -following three methods, which together form the -\dfn{with statement context protocol}: - -\begin{methoddesc}[with statement context]{__context__}{} - Return the context object itself. This is required to allow both - context objects and context managers to be used in a \keyword{with} +\begin{methoddesc}[context manager]{__enter__}{} + Enter the runtime context and return either this object or another + object related to the runtime context. The value returned by this + method is bound to the identifier in the \keyword{as} clause of + \keyword{with} statements using this context manager. + + An example of a context manager that returns itself is a file object. + File objects return themselves from __enter__() to allow + \function{open()} to be used as the context expression in a with statement. -\end{methoddesc} -\begin{methoddesc}[with statement context]{__enter__}{} - Enter the runtime context and return either the defining context - manager or another object related to the runtime context. The value - returned by this method is bound to the identifier in the - \keyword{as} clause of \keyword{with} statements using this context. - (An example of a context object that returns the original context - manager is file objects, which are returned from __enter__() to - allow \function{open()} to be used directly in a with - statement. An example of a context object that returns a related - object is \code{decimal.Context} which sets the active decimal - context to a copy of the context manager and then returns the copy. - This allows changes to be made to the current decimal context in the - body of the \keyword{with} statement without affecting code outside - the \keyword{with} statement). + An example of a context manager that returns a related + object is the one returned by \code{decimal.Context.get_manager()}. + These managers set the active decimal context to a copy of the + original decimal context and then return the copy. This allows + changes to be made to the current decimal context in the body of + the \keyword{with} statement without affecting code outside + the \keyword{with} statement. \end{methoddesc} -\begin{methoddesc}[with statement context]{__exit__}{exc_type, exc_val, exc_tb} +\begin{methoddesc}[context manager]{__exit__}{exc_type, exc_val, exc_tb} Exit the runtime context and return a Boolean flag indicating if any expection that occurred should be suppressed. If an exception occurred while executing the body of the \keyword{with} statement, the arguments contain the exception type, value and traceback information. Otherwise, all three arguments are \var{None}. + Returning a true value from this method will cause the \keyword{with} statement to suppress the exception and continue execution with the statement immediately following the \keyword{with} statement. Otherwise @@ -1821,6 +1804,7 @@ executing. Exceptions that occur during execution of this method will replace any exception that occurred in the body of the \keyword{with} statement. + The exception passed in should never be reraised explicitly - instead, this method should return a false value to indicate that the method completed successfully and does not want to suppress the raised @@ -1829,20 +1813,18 @@ \method{__exit__()} method has actually failed. \end{methoddesc} -Python defines several context objects and managers to support -easy thread synchronisation, prompt closure of files or other -objects, and thread-safe manipulation of the decimal arithmetic -context. The specific types are not important beyond their -implementation of the context management and with statement context -protocols. +Python defines several context managers to support easy thread +synchronisation, prompt closure of files or other objects, and +simpler manipulation of the active decimal arithmetic +context. The specific types are not treated specially beyond +their implementation of the context management protocol. Python's generators and the \code{contextlib.contextfactory} decorator -provide a convenient way to implement these protocols. If a context -manager's \method{__context__()} method is implemented as a -generator decorated with the \code{contextlib.contextfactory} -decorator, it will automatically return a with statement context -object supplying the necessary \method{__context__()}, -\method{__enter__()} and \method{__exit__()} methods. +provide a convenient way to implement these protocols. If a generator +function is decorated with the \code{contextlib.contextfactory} +decorator, it will return a context manager implementing the necessary +\method{__enter__()} and \method{__exit__()} methods, rather than the +iterator produced by an undecorated generator function. Note that there is no specific slot for any of these methods in the type structure for Python objects in the Python/C API. Extension Modified: python/trunk/Doc/ref/ref3.tex ============================================================================== --- python/trunk/Doc/ref/ref3.tex (original) +++ python/trunk/Doc/ref/ref3.tex Wed May 3 15:02:47 2006 @@ -2112,14 +2112,13 @@ \end{itemize} -\subsection{With Statement Contexts and Context Managers\label{context-managers}} +\subsection{With Statement Context Managers\label{context-managers}} \versionadded{2.5} A \dfn{context manager} is an object that defines the runtime context to be established when executing a \keyword{with} -statement. The context manager provides a -\dfn{with statement context object} which manages the entry into, +statement. The context manager handles the entry into, and the exit from, the desired runtime context for the execution of the block of code. Context managers are normally invoked using the \keyword{with} statement (described in section~\ref{with}), but @@ -2127,18 +2126,16 @@ \stindex{with} \index{context manager} -\index{context (with statement)} -\index{with statement context} -Typical uses of context managers and contexts include saving and +Typical uses of context managers include saving and restoring various kinds of global state, locking and unlocking resources, closing opened files, etc. -For more information on context managers and context objects, -see ``\ulink{Context Types}{../lib/typecontext.html}'' in the +For more information on context managers, see +``\ulink{Context Types}{../lib/typecontextmanager.html}'' in the \citetitle[../lib/lib.html]{Python Library Reference}. -\begin{methoddesc}[with statement context]{__enter__}{self} +\begin{methoddesc}[context manager]{__enter__}{self} Enter the runtime context related to this object. The \keyword{with} statement will bind this method's return value to the target(s) specified in the \keyword{as} clause of the statement, if any. Modified: python/trunk/Doc/ref/ref7.tex ============================================================================== --- python/trunk/Doc/ref/ref7.tex (original) +++ python/trunk/Doc/ref/ref7.tex Wed May 3 15:02:47 2006 @@ -315,8 +315,8 @@ \versionadded{2.5} The \keyword{with} statement is used to wrap the execution of a block -with methods defined by a context manager or \keyword{with} statement context -object (see section~\ref{context-managers}). This allows common +with methods defined by a context manager (see +section~\ref{context-managers}). This allows common \keyword{try}...\keyword{except}...\keyword{finally} usage patterns to be encapsulated for convenient reuse. Modified: python/trunk/Lib/contextlib.py ============================================================================== --- python/trunk/Lib/contextlib.py (original) +++ python/trunk/Lib/contextlib.py Wed May 3 15:02:47 2006 @@ -2,10 +2,10 @@ import sys -__all__ = ["contextfactory", "nested", "closing"] +__all__ = ["contextmanager", "nested", "closing"] -class GeneratorContext(object): - """Helper for @contextfactory decorator.""" +class GeneratorContextManager(object): + """Helper for @contextmanager decorator.""" def __init__(self, gen): self.gen = gen @@ -45,12 +45,12 @@ raise -def contextfactory(func): - """@contextfactory decorator. +def contextmanager(func): + """@contextmanager decorator. Typical usage: - @contextfactory + @contextmanager def some_generator(): try: @@ -74,7 +74,7 @@ """ def helper(*args, **kwds): - return GeneratorContext(func(*args, **kwds)) + return GeneratorContextManager(func(*args, **kwds)) try: helper.__name__ = func.__name__ helper.__doc__ = func.__doc__ @@ -84,7 +84,7 @@ return helper - at contextfactory + at contextmanager def nested(*managers): """Support multiple context managers in a single with-statement. Modified: python/trunk/Lib/decimal.py ============================================================================== --- python/trunk/Lib/decimal.py (original) +++ python/trunk/Lib/decimal.py Wed May 3 15:02:47 2006 @@ -2173,7 +2173,7 @@ del name, val, globalname, rounding_functions -class WithStatementContext(object): +class ContextManager(object): """Helper class to simplify Context management. Sample usage: @@ -2248,8 +2248,8 @@ s.append('traps=[' + ', '.join([t.__name__ for t, v in self.traps.items() if v]) + ']') return ', '.join(s) + ')' - def context_manager(self): - return WithStatementContext(self.copy()) + def get_manager(self): + return ContextManager(self.copy()) def clear_flags(self): """Reset all flags to zero""" Modified: python/trunk/Lib/test/test_contextlib.py ============================================================================== --- python/trunk/Lib/test/test_contextlib.py (original) +++ python/trunk/Lib/test/test_contextlib.py Wed May 3 15:02:47 2006 @@ -13,9 +13,9 @@ class ContextManagerTestCase(unittest.TestCase): - def test_contextfactory_plain(self): + def test_contextmanager_plain(self): state = [] - @contextfactory + @contextmanager def woohoo(): state.append(1) yield 42 @@ -26,9 +26,9 @@ state.append(x) self.assertEqual(state, [1, 42, 999]) - def test_contextfactory_finally(self): + def test_contextmanager_finally(self): state = [] - @contextfactory + @contextmanager def woohoo(): state.append(1) try: @@ -47,8 +47,8 @@ self.fail("Expected ZeroDivisionError") self.assertEqual(state, [1, 42, 999]) - def test_contextfactory_no_reraise(self): - @contextfactory + def test_contextmanager_no_reraise(self): + @contextmanager def whee(): yield ctx = whee() @@ -56,8 +56,8 @@ # Calling __exit__ should not result in an exception self.failIf(ctx.__exit__(TypeError, TypeError("foo"), None)) - def test_contextfactory_trap_yield_after_throw(self): - @contextfactory + def test_contextmanager_trap_yield_after_throw(self): + @contextmanager def whoo(): try: yield @@ -69,9 +69,9 @@ RuntimeError, ctx.__exit__, TypeError, TypeError("foo"), None ) - def test_contextfactory_except(self): + def test_contextmanager_except(self): state = [] - @contextfactory + @contextmanager def woohoo(): state.append(1) try: @@ -86,14 +86,14 @@ raise ZeroDivisionError(999) self.assertEqual(state, [1, 42, 999]) - def test_contextfactory_attribs(self): + def test_contextmanager_attribs(self): def attribs(**kw): def decorate(func): for k,v in kw.items(): setattr(func,k,v) return func return decorate - @contextfactory + @contextmanager @attribs(foo='bar') def baz(spam): """Whee!""" @@ -106,13 +106,13 @@ # XXX This needs more work def test_nested(self): - @contextfactory + @contextmanager def a(): yield 1 - @contextfactory + @contextmanager def b(): yield 2 - @contextfactory + @contextmanager def c(): yield 3 with nested(a(), b(), c()) as (x, y, z): @@ -122,14 +122,14 @@ def test_nested_cleanup(self): state = [] - @contextfactory + @contextmanager def a(): state.append(1) try: yield 2 finally: state.append(3) - @contextfactory + @contextmanager def b(): state.append(4) try: @@ -148,7 +148,7 @@ def test_nested_right_exception(self): state = [] - @contextfactory + @contextmanager def a(): yield 1 class b(object): @@ -170,10 +170,10 @@ self.fail("Didn't raise ZeroDivisionError") def test_nested_b_swallows(self): - @contextfactory + @contextmanager def a(): yield - @contextfactory + @contextmanager def b(): try: yield @@ -187,7 +187,7 @@ self.fail("Didn't swallow ZeroDivisionError") def test_nested_break(self): - @contextfactory + @contextmanager def a(): yield state = 0 @@ -199,7 +199,7 @@ self.assertEqual(state, 1) def test_nested_continue(self): - @contextfactory + @contextmanager def a(): yield state = 0 @@ -211,7 +211,7 @@ self.assertEqual(state, 3) def test_nested_return(self): - @contextfactory + @contextmanager def a(): try: yield @@ -339,12 +339,12 @@ orig_context = ctx.copy() try: ctx.prec = save_prec = decimal.ExtendedContext.prec + 5 - with decimal.ExtendedContext.context_manager(): + with decimal.ExtendedContext.get_manager(): self.assertEqual(decimal.getcontext().prec, decimal.ExtendedContext.prec) self.assertEqual(decimal.getcontext().prec, save_prec) try: - with decimal.ExtendedContext.context_manager(): + with decimal.ExtendedContext.get_manager(): self.assertEqual(decimal.getcontext().prec, decimal.ExtendedContext.prec) 1/0 Modified: python/trunk/Lib/test/test_with.py ============================================================================== --- python/trunk/Lib/test/test_with.py (original) +++ python/trunk/Lib/test/test_with.py Wed May 3 15:02:47 2006 @@ -10,25 +10,26 @@ import sys import unittest from collections import deque -from contextlib import GeneratorContext, contextfactory +from contextlib import GeneratorContextManager, contextmanager from test.test_support import run_unittest -class MockContextManager(GeneratorContext): +class MockContextManager(GeneratorContextManager): def __init__(self, gen): - GeneratorContext.__init__(self, gen) + GeneratorContextManager.__init__(self, gen) self.enter_called = False self.exit_called = False self.exit_args = None def __enter__(self): self.enter_called = True - return GeneratorContext.__enter__(self) + return GeneratorContextManager.__enter__(self) def __exit__(self, type, value, traceback): self.exit_called = True self.exit_args = (type, value, traceback) - return GeneratorContext.__exit__(self, type, value, traceback) + return GeneratorContextManager.__exit__(self, type, + value, traceback) def mock_contextmanager(func): @@ -439,7 +440,7 @@ self.assertAfterWithGeneratorInvariantsNoError(self.bar) def testRaisedStopIteration1(self): - @contextfactory + @contextmanager def cm(): yield @@ -463,7 +464,7 @@ self.assertRaises(StopIteration, shouldThrow) def testRaisedGeneratorExit1(self): - @contextfactory + @contextmanager def cm(): yield From python-checkins at python.org Wed May 3 15:17:50 2006 From: python-checkins at python.org (nick.coghlan) Date: Wed, 3 May 2006 15:17:50 +0200 (CEST) Subject: [Python-checkins] r45888 - python/trunk/Doc/lib/libcontextlib.tex python/trunk/Doc/lib/libstdtypes.tex Message-ID: <20060503131750.0CD471E4019@bag.python.org> Author: nick.coghlan Date: Wed May 3 15:17:49 2006 New Revision: 45888 Modified: python/trunk/Doc/lib/libcontextlib.tex python/trunk/Doc/lib/libstdtypes.tex Log: Get rid of a couple more context object references, fix some markup and clarify what happens when a generator context function swallows an exception. Modified: python/trunk/Doc/lib/libcontextlib.tex ============================================================================== --- python/trunk/Doc/lib/libcontextlib.tex (original) +++ python/trunk/Doc/lib/libcontextlib.tex Wed May 3 15:17:49 2006 @@ -13,7 +13,7 @@ \begin{funcdesc}{contextmanager}{func} This function is a decorator that can be used to define a factory -function for \keyword{with} statement context objects, without +function for \keyword{with} statement context managers, without needing to create a class or separate \method{__enter__()} and \method{__exit__()} methods. @@ -52,9 +52,10 @@ the error (if any), or ensure that some cleanup takes place. If an exception is trapped merely in order to log it or to perform some action (rather than to suppress it entirely), the generator must -reraise that exception. Otherwise the \keyword{with} statement will -treat the exception as having been handled, and resume execution with -the statement immediately following the \keyword{with} statement. +reraise that exception. Otherwise the generator context manager will +indicate to the \keyword{with} statement that the exception has been +handled, and execution will resume with the statement immediately +following the \keyword{with} statement. \end{funcdesc} \begin{funcdesc}{nested}{mgr1\optional{, mgr2\optional{, ...}}} @@ -81,9 +82,9 @@ Note that if the \method{__exit__()} method of one of the nested context managers indicates an exception should be suppressed, no exception information will be passed to any remaining outer context -objects. Similarly, if the \method{__exit__()} method of one of the -nested context managers raises an exception, any previous exception -state will be lost; the new exception will be passed to the +managers. Similarly, if the \method{__exit__()} method of one of the +nested managers raises an exception, any previous exception state will +be lost; the new exception will be passed to the \method{__exit__()} methods of any remaining outer context managers. In general, \method{__exit__()} methods should avoid raising exceptions, and in particular they should not re-raise a Modified: python/trunk/Doc/lib/libstdtypes.tex ============================================================================== --- python/trunk/Doc/lib/libstdtypes.tex (original) +++ python/trunk/Doc/lib/libstdtypes.tex Wed May 3 15:17:49 2006 @@ -1778,8 +1778,8 @@ An example of a context manager that returns itself is a file object. File objects return themselves from __enter__() to allow - \function{open()} to be used as the context expression in a with - statement. + \function{open()} to be used as the context expression in a + \keyword{with} statement. An example of a context manager that returns a related object is the one returned by \code{decimal.Context.get_manager()}. From buildbot at python.org Wed May 3 15:22:14 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 13:22:14 +0000 Subject: [Python-checkins] buildbot warnings in hppa Ubuntu dapper trunk Message-ID: <20060503132214.DA48D1E400B@bag.python.org> The Buildbot has detected a new failure of hppa Ubuntu dapper trunk. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%2520trunk/builds/359 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: nick.coghlan Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Wed May 3 15:51:43 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 13:51:43 +0000 Subject: [Python-checkins] buildbot warnings in ia64 Debian unstable trunk Message-ID: <20060503135143.D12491E400B@bag.python.org> The Buildbot has detected a new failure of ia64 Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%2520Debian%2520unstable%2520trunk/builds/347 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: nick.coghlan Build Had Warnings: warnings failed slave lost sincerely, -The Buildbot From buildbot at python.org Wed May 3 16:35:24 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 14:35:24 +0000 Subject: [Python-checkins] buildbot failure in x86 Ubuntu dapper (icc) trunk Message-ID: <20060503143524.AC8BF1E401C@bag.python.org> The Buildbot has detected a new failure of x86 Ubuntu dapper (icc) trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520dapper%2520%2528icc%2529%2520trunk/builds/318 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: nick.coghlan BUILD FAILED: failed failed slave lost sincerely, -The Buildbot From python-checkins at python.org Wed May 3 19:46:14 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 19:46:14 +0200 (CEST) Subject: [Python-checkins] r45889 - python/trunk/Lib/webbrowser.py Message-ID: <20060503174614.58BEE1E4013@bag.python.org> Author: georg.brandl Date: Wed May 3 19:46:13 2006 New Revision: 45889 Modified: python/trunk/Lib/webbrowser.py Log: Add seamonkey to list of Windows browsers too. Modified: python/trunk/Lib/webbrowser.py ============================================================================== --- python/trunk/Lib/webbrowser.py (original) +++ python/trunk/Lib/webbrowser.py Wed May 3 19:46:13 2006 @@ -509,7 +509,8 @@ _tryorder = [] _browsers = {} # Prefer mozilla/netscape/opera if present - for browser in ("firefox", "firebird", "mozilla", "netscape", "opera"): + for browser in ("firefox", "firebird", "seamonkey", "mozilla", + "netscape", "opera"): if _iscommand(browser): register(browser, None, BackgroundBrowser(browser)) register("windows-default", WindowsDefault) From python-checkins at python.org Wed May 3 20:03:23 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 20:03:23 +0200 (CEST) Subject: [Python-checkins] r45890 - python/trunk/Lib/httplib.py Message-ID: <20060503180323.939D51E4013@bag.python.org> Author: georg.brandl Date: Wed May 3 20:03:22 2006 New Revision: 45890 Modified: python/trunk/Lib/httplib.py Log: RFE #1472176: In httplib, don't encode the netloc and hostname with "idna" if not necessary. Modified: python/trunk/Lib/httplib.py ============================================================================== --- python/trunk/Lib/httplib.py (original) +++ python/trunk/Lib/httplib.py Wed May 3 20:03:22 2006 @@ -796,11 +796,20 @@ nil, netloc, nil, nil, nil = urlsplit(url) if netloc: - self.putheader('Host', netloc.encode("idna")) - elif self.port == HTTP_PORT: - self.putheader('Host', self.host.encode("idna")) + try: + netloc_enc = netloc.encode("ascii") + except UnicodeEncodeError: + netloc_enc = netloc.encode("idna") + self.putheader('Host', netloc_enc) else: - self.putheader('Host', "%s:%s" % (self.host.encode("idna"), self.port)) + try: + host_enc = self.host.encode("ascii") + except UnicodeEncodeError: + host_enc = self.host.encode("idna") + if self.port == HTTP_PORT: + self.putheader('Host', host_enc) + else: + self.putheader('Host', "%s:%s" % (host_enc, self.port)) # note: we are assuming that clients will not attempt to set these # headers since *this* library must deal with the From python-checkins at python.org Wed May 3 20:12:34 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 20:12:34 +0200 (CEST) Subject: [Python-checkins] r45891 - python/trunk/Lib/pdb.py Message-ID: <20060503181234.2D8D71E400B@bag.python.org> Author: georg.brandl Date: Wed May 3 20:12:33 2006 New Revision: 45891 Modified: python/trunk/Lib/pdb.py Log: Bug #1472191: convert breakpoint indices to ints before comparing them to ints Modified: python/trunk/Lib/pdb.py ============================================================================== --- python/trunk/Lib/pdb.py (original) +++ python/trunk/Lib/pdb.py Wed May 3 20:12:33 2006 @@ -527,7 +527,7 @@ arg = arg[i+1:] try: lineno = int(arg) - except: + except ValueError: err = "Invalid line number (%s)" % arg else: err = self.clear_break(filename, lineno) @@ -535,6 +535,12 @@ return numberlist = arg.split() for i in numberlist: + try: + i = int(i) + except ValueError: + print 'Breakpoint index %r is not a number' % i + continue + if not (0 <= i < len(bdb.Breakpoint.bpbynumber)): print 'No breakpoint numbered', i continue From python-checkins at python.org Wed May 3 20:12:37 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 20:12:37 +0200 (CEST) Subject: [Python-checkins] r45892 - python/branches/release24-maint/Lib/pdb.py Message-ID: <20060503181237.01CE51E400B@bag.python.org> Author: georg.brandl Date: Wed May 3 20:12:36 2006 New Revision: 45892 Modified: python/branches/release24-maint/Lib/pdb.py Log: Bug #1472191: convert breakpoint indices to ints before comparing them to ints (backport from rev. 45891) Modified: python/branches/release24-maint/Lib/pdb.py ============================================================================== --- python/branches/release24-maint/Lib/pdb.py (original) +++ python/branches/release24-maint/Lib/pdb.py Wed May 3 20:12:36 2006 @@ -442,7 +442,7 @@ arg = arg[i+1:] try: lineno = int(arg) - except: + except ValueError: err = "Invalid line number (%s)" % arg else: err = self.clear_break(filename, lineno) @@ -450,6 +450,12 @@ return numberlist = arg.split() for i in numberlist: + try: + i = int(i) + except ValueError: + print 'Breakpoint index %r is not a number' % i + continue + if not (0 <= i < len(bdb.Breakpoint.bpbynumber)): print 'No breakpoint numbered', i continue From python-checkins at python.org Wed May 3 20:18:33 2006 From: python-checkins at python.org (georg.brandl) Date: Wed, 3 May 2006 20:18:33 +0200 (CEST) Subject: [Python-checkins] r45893 - in python/trunk: Lib/compiler/transformer.py Lib/test/test_compiler.py Misc/NEWS Message-ID: <20060503181833.0DF721E400B@bag.python.org> Author: georg.brandl Date: Wed May 3 20:18:32 2006 New Revision: 45893 Modified: python/trunk/Lib/compiler/transformer.py python/trunk/Lib/test/test_compiler.py python/trunk/Misc/NEWS Log: Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler package. Modified: python/trunk/Lib/compiler/transformer.py ============================================================================== --- python/trunk/Lib/compiler/transformer.py (original) +++ python/trunk/Lib/compiler/transformer.py Wed May 3 20:18:32 2006 @@ -841,17 +841,15 @@ names.append(self.com_fpdef(node)) i = i + 1 - if i >= len(nodelist): - break - - if nodelist[i][0] == token.EQUAL: + if i < len(nodelist) and nodelist[i][0] == token.EQUAL: defaults.append(self.com_node(nodelist[i + 1])) i = i + 2 elif len(defaults): - # XXX This should be a syntax error. - # Treat "(a=1, b)" as "(a=1, b=None)" - defaults.append(Const(None)) + # we have already seen an argument with default, but here + # came one without + raise SyntaxError, "non-default argument follows default argument" + # skip the comma i = i + 1 return names, defaults, flags Modified: python/trunk/Lib/test/test_compiler.py ============================================================================== --- python/trunk/Lib/test/test_compiler.py (original) +++ python/trunk/Lib/test/test_compiler.py Wed May 3 20:18:32 2006 @@ -56,6 +56,9 @@ def testYieldExpr(self): compiler.compile("def g(): yield\n\n", "", "exec") + def testDefaultArgs(self): + self.assertRaises(SyntaxError, compiler.parse, "def foo(a=1, b): pass") + def testLineNo(self): # Test that all nodes except Module have a correct lineno attribute. filename = __file__ Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Wed May 3 20:18:32 2006 @@ -91,6 +91,9 @@ Library ------- +- Bug #1385040: don't allow "def foo(a=1, b): pass" in the compiler + package. + - Patch #1472854: make the rlcompleter.Completer class usable on non- UNIX platforms. From buildbot at python.org Wed May 3 20:33:36 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 18:33:36 +0000 Subject: [Python-checkins] buildbot warnings in x86 W2k trunk Message-ID: <20060503183336.ABC831E400B@bag.python.org> The Buildbot has detected a new failure of x86 W2k trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520W2k%2520trunk/builds/641 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl Build Had Warnings: warnings failed slave lost sincerely, -The Buildbot From python-checkins at python.org Wed May 3 20:35:39 2006 From: python-checkins at python.org (thomas.heller) Date: Wed, 3 May 2006 20:35:39 +0200 (CEST) Subject: [Python-checkins] r45894 - python/trunk/Lib/ctypes/test/test_find.py Message-ID: <20060503183539.E3C391E4050@bag.python.org> Author: thomas.heller Date: Wed May 3 20:35:39 2006 New Revision: 45894 Modified: python/trunk/Lib/ctypes/test/test_find.py Log: Don't fail the tests when libglut.so or libgle.so cannot be loaded. Modified: python/trunk/Lib/ctypes/test/test_find.py ============================================================================== --- python/trunk/Lib/ctypes/test/test_find.py (original) +++ python/trunk/Lib/ctypes/test/test_find.py Wed May 3 20:35:39 2006 @@ -39,9 +39,23 @@ if lib_glu: self.glu = CDLL(lib_glu, RTLD_GLOBAL) if lib_glut: - self.glut = CDLL(lib_glut) + # On some systems, additional libraries seem to be + # required, loading glut fails with + # "OSError: /usr/lib/libglut.so.3: undefined symbol: XGetExtensionVersion" + # I cannot figure out how to repair the test on these + # systems (red hat), so we ignore it when the glut or gle + # libraries cannot be loaded. See also: + # https://sourceforge.net/tracker/?func=detail&atid=105470&aid=1478253&group_id=5470 + # http://mail.python.org/pipermail/python-dev/2006-May/064789.html + try: + self.glut = CDLL(lib_glut) + except OSError: + pass if lib_gle: - self.gle = CDLL(lib_gle) + try: + self.gle = CDLL(lib_gle) + except OSError: + pass if lib_gl: def test_gl(self): From buildbot at python.org Wed May 3 20:54:51 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 18:54:51 +0000 Subject: [Python-checkins] buildbot failure in x86 cygwin trunk Message-ID: <20060503185451.EC4951E4012@bag.python.org> The Buildbot has detected a new failure of x86 cygwin trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520cygwin%2520trunk/builds/358 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl,thomas.heller BUILD FAILED: failed svn sincerely, -The Buildbot From buildbot at python.org Wed May 3 21:15:34 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 19:15:34 +0000 Subject: [Python-checkins] buildbot warnings in x86 Ubuntu dapper (icc) trunk Message-ID: <20060503191534.4567A1E400B@bag.python.org> The Buildbot has detected a new failure of x86 Ubuntu dapper (icc) trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520dapper%2520%2528icc%2529%2520trunk/builds/319 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Wed May 3 22:20:02 2006 From: buildbot at python.org (buildbot at python.org) Date: Wed, 03 May 2006 20:20:02 +0000 Subject: [Python-checkins] buildbot warnings in x86 Ubuntu dapper (icc) 2.4 Message-ID: <20060503202003.0395D1E400B@bag.python.org> The Buildbot has detected a new failure of x86 Ubuntu dapper (icc) 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520dapper%2520%2528icc%2529%25202.4/builds/55 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From neal at metaslash.com Wed May 3 22:12:22 2006 From: neal at metaslash.com (Neal Norwitz) Date: Wed, 3 May 2006 16:12:22 -0400 Subject: [Python-checkins] Python Regression Test Failures basics (1) Message-ID: <20060503201222.GA1399@python.psfb.org> case $MAKEFLAGS in \ *-s*) CC='gcc -pthread' LDSHARED='gcc -pthread -shared' OPT='-g -Wall -Wstrict-prototypes' ./python -E ./setup.py -q build;; \ *) CC='gcc -pthread' LDSHARED='gcc -pthread -shared' OPT='-g -Wall -Wstrict-prototypes' ./python -E ./setup.py build;; \ esac running build running build_ext db.h: found (4, 1) in /usr/include db lib: using (4, 1) db-4.1 sqlite: found /usr/include/sqlite3.h /usr/include/sqlite3.h: version 3.2.1 INFO: Can't locate Tcl/Tk libs and/or headers running build_scripts [33703 refs] ./python -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform [8453 refs] find ./Lib -name '*.py[co]' -print | xargs rm -f ./python -E -tt ./Lib/test/regrtest.py -l test_grammar test_opcodes test_operations test_builtin test_exceptions test_types test_MimeWriter test_StringIO test___all__ test___future__ test__locale test_aepack test_aepack skipped -- No module named aepack test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named macostools test_array test_ast test_asynchat test_atexit test_audioop test_augassign test_base64 test_bastion test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_bufio test_bz2 test_cProfile test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd_line test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_colorsys test_commands test_compare test_compile test_compiler test_complex test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_crypt test_csv test_ctypes test test_ctypes failed -- Traceback (most recent call last): File "/home/neal/python/trunk/Lib/ctypes/test/test_python_api.py", line 41, in test_PyInt_Long self.failUnlessEqual(grc(42), ref42) AssertionError: 336 != 337 test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_dict test_difflib test_dircache test_dis test_distutils test_dl test_doctest test_doctest2 test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_errno test_exception_variations test_extcall test_fcntl test_file test_filecmp test_fileinput test_float test_fnmatch test_fork1 test_format test_fpformat test_frozen test_funcattrs test_functional test_future test_gc test_gdbm test_generators test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hexoct test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_imageop test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_index test_inspect test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_largefile test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macfs test_macfs skipped -- No module named macfs test_macostools test_macostools skipped -- No module named macostools test_macpath test_mailbox test_marshal test_math test_md5 test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_multibytecodec test_multibytecodec_support test_multifile test_mutants test_netrc test_new test_nis test_nis skipped -- Local domain name not set test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- test works only on NT+ test_pep292 test_pep352 test_pickle test_pickletools test_pkg test_pkgimport test_platform test_plistlib test_plistlib skipped -- No module named plistlib test_poll test_popen [8458 refs] [8458 refs] [8458 refs] test_popen2 test_posix test_posixpath test_pow test_pprint test_profile test_profilehooks test_pty test_pwd test_pyclbr test_pyexpat test_queue test_quopri [8794 refs] [8794 refs] test_random test_re test_repr test_resource test_rfc822 test_rgbimg test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site test_slice test_socket test_socket_ssl test_socket_ssl skipped -- Use of the `network' resource not enabled test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_startfile test_startfile skipped -- cannot import name startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_struct test_structseq test_subprocess [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8669 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] this bit of output is from a test of stdout in a different process ... [8453 refs] [8453 refs] [8669 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [8453 refs] [8453 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_tempfile [8453 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tokenize test_trace test_traceback test_transformer test_tuple test_ucn test_unary test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_unittest test_univnewlines test_unpack test_urllib test_urllib2 test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_wait3 test_wait4 test_warnings test_wave test_weakref test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile test_zipimport test_zlib 284 tests OK. 1 test failed: test_ctypes 30 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_gl test_imgfile test_ioctl test_linuxaudiodev test_macfs test_macostools test_nis test_ossaudiodev test_pep277 test_plistlib test_scriptpackages test_socket_ssl test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound 1 skip unexpected on linux2: test_ioctl [421533 refs] make: [test] Error 1 (ignored) ./python -E -tt ./Lib/test/regrtest.py -l test_grammar test_opcodes test_operations test_builtin test_exceptions test_types test_MimeWriter test_StringIO test___all__ test___future__ test__locale test_aepack test_aepack skipped -- No module named aepack test_al test_al skipped -- No module named al test_anydbm test_applesingle test_applesingle skipped -- No module named macostools test_array test_ast test_asynchat test_atexit test_audioop test_augassign test_base64 test_bastion test_bigmem test_binascii test_binhex test_binop test_bisect test_bool test_bsddb test_bsddb185 test_bsddb185 skipped -- No module named bsddb185 test_bsddb3 test_bsddb3 skipped -- Use of the `bsddb' resource not enabled test_bufio test_bz2 test_cProfile test_calendar test_call test_capi test_cd test_cd skipped -- No module named cd test_cfgparser test_cgi test_charmapcodec test_cl test_cl skipped -- No module named cl test_class test_cmath test_cmd_line test_code test_codeccallbacks test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecmaps_cn test_codecmaps_hk test_codecmaps_jp test_codecmaps_kr test_codecmaps_tw test_codecs test_codeop test_coding test_coercion test_colorsys test_commands test_compare test_compile test_compiler test_complex test_contains test_contextlib test_cookie test_cookielib test_copy test_copy_reg test_cpickle test_crypt test_csv test_ctypes test_curses test_curses skipped -- Use of the `curses' resource not enabled test_datetime test_dbm test_decimal test_decorators test_defaultdict test_deque test_descr test_descrtut test_dict test_difflib test_dircache test_dis test_distutils test_dl test_doctest test_doctest2 test_dumbdbm test_dummy_thread test_dummy_threading test_email test_email_codecs test_email_renamed test_enumerate test_eof test_errno test_exception_variations test_extcall test_fcntl test_file test_filecmp test_fileinput test_float test_fnmatch test_fork1 test_format test_fpformat test_frozen test_funcattrs test_functional test_future test_gc test_gdbm test_generators test_genexps test_getargs test_getargs2 test_getopt test_gettext test_gl test_gl skipped -- No module named gl test_glob test_global test_grp test_gzip test_hash test_hashlib test_heapq test_hexoct test_hmac test_hotshot test_htmllib test_htmlparser test_httplib test_imageop test_imaplib test_imgfile test_imgfile skipped -- No module named imgfile test_imp test_import test_importhooks test_index test_inspect test_ioctl test_ioctl skipped -- Unable to open /dev/tty test_isinstance test_iter test_iterlen test_itertools test_largefile test_linuxaudiodev test_linuxaudiodev skipped -- Use of the `audio' resource not enabled test_list test_locale test_logging test_long test_long_future test_longexp test_macfs test_macfs skipped -- No module named macfs test_macostools test_macostools skipped -- No module named macostools test_macpath test_mailbox test_marshal test_math test_md5 test_mhlib test_mimetools test_mimetypes test_minidom test_mmap test_module test_multibytecodec test_multibytecodec_support test_multifile test_mutants test_netrc test_new test_nis test_nis skipped -- Local domain name not set test_normalization test_ntpath test_old_mailbox test_openpty test_operator test_optparse test_os test_ossaudiodev test_ossaudiodev skipped -- Use of the `audio' resource not enabled test_parser test_peepholer test_pep247 test_pep263 test_pep277 test_pep277 skipped -- test works only on NT+ test_pep292 test_pep352 test_pickle test_pickletools test_pkg test_pkgimport test_platform test_plistlib test_plistlib skipped -- No module named plistlib test_poll test_popen [8458 refs] [8458 refs] [8458 refs] test_popen2 test_posix test_posixpath test_pow test_pprint test_profile test_profilehooks test_pty test_pwd test_pyclbr test_pyexpat test_queue test_quopri [8794 refs] [8794 refs] test_random test_re test_repr test_resource test_rfc822 test_rgbimg test_richcmp test_robotparser test_runpy test_sax test_scope test_scriptpackages test_scriptpackages skipped -- No module named aetools test_select test_set test_sets test_sgmllib test_sha test_shelve test_shlex test_shutil test_signal test_site test_slice test_socket test_socket_ssl test_socket_ssl skipped -- Use of the `network' resource not enabled test_socketserver test_socketserver skipped -- Use of the `network' resource not enabled test_softspace test_sort test_sqlite test_startfile test_startfile skipped -- cannot import name startfile test_str test_strftime test_string test_stringprep test_strop test_strptime test_struct test_structseq test_subprocess [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8669 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] [8453 refs] this bit of output is from a test of stdout in a different process ... [8453 refs] [8453 refs] [8669 refs] test_sunaudiodev test_sunaudiodev skipped -- No module named sunaudiodev test_sundry test_symtable test_syntax test_sys [8453 refs] [8453 refs] test_tarfile test_tcl test_tcl skipped -- No module named _tkinter test_tempfile [8453 refs] test_textwrap test_thread test_threaded_import test_threadedtempfile test_threading test_threading_local test_threadsignals test_time test_timeout test_timeout skipped -- Use of the `network' resource not enabled test_tokenize test_trace test_traceback test_transformer test_tuple test_ucn test_unary test_unicode test_unicode_file test_unicode_file skipped -- No Unicode filesystem semantics on this platform. test_unicodedata test_unittest test_univnewlines test_unpack test_urllib test_urllib2 test_urllib2net test_urllib2net skipped -- Use of the `network' resource not enabled test_urllibnet test_urllibnet skipped -- Use of the `network' resource not enabled test_urlparse test_userdict test_userlist test_userstring test_uu test_wait3 test_wait4 test_warnings test_wave test_weakref test_whichdb test_winreg test_winreg skipped -- No module named _winreg test_winsound test_winsound skipped -- No module named winsound test_with test_xdrlib test_xml_etree test_xml_etree_c test_xmllib test_xmlrpc test_xpickle test_xrange test_zipfile test_zipimport test_zlib 285 tests OK. 30 tests skipped: test_aepack test_al test_applesingle test_bsddb185 test_bsddb3 test_cd test_cl test_curses test_gl test_imgfile test_ioctl test_linuxaudiodev test_macfs test_macostools test_nis test_ossaudiodev test_pep277 test_plistlib test_scriptpackages test_socket_ssl test_socketserver test_startfile test_sunaudiodev test_tcl test_timeout test_unicode_file test_urllib2net test_urllibnet test_winreg test_winsound 1 skip unexpected on linux2: test_ioctl [420988 refs] From python-checkins at python.org Thu May 4 07:08:12 2006 From: python-checkins at python.org (georg.brandl) Date: Thu, 4 May 2006 07:08:12 +0200 (CEST) Subject: [Python-checkins] r45895 - python/trunk/Lib/imputil.py Message-ID: <20060504050812.03A751E4006@bag.python.org> Author: georg.brandl Date: Thu May 4 07:08:10 2006 New Revision: 45895 Modified: python/trunk/Lib/imputil.py Log: Bug #1481530: allow "from os.path import ..." with imputil Modified: python/trunk/Lib/imputil.py ============================================================================== --- python/trunk/Lib/imputil.py (original) +++ python/trunk/Lib/imputil.py Thu May 4 07:08:10 2006 @@ -131,9 +131,12 @@ if importer: return importer._finish_import(top_module, parts[1:], fromlist) - # Grrr, some people "import os.path" + # Grrr, some people "import os.path" or do "from os.path import ..." if len(parts) == 2 and hasattr(top_module, parts[1]): - return top_module + if fromlist: + return getattr(top_module, parts[1]) + else: + return top_module # If the importer does not exist, then we have to bail. A missing # importer means that something else imported the module, and we have From python-checkins at python.org Thu May 4 07:08:19 2006 From: python-checkins at python.org (georg.brandl) Date: Thu, 4 May 2006 07:08:19 +0200 (CEST) Subject: [Python-checkins] r45896 - python/branches/release24-maint/Lib/imputil.py Message-ID: <20060504050819.53A4B1E4006@bag.python.org> Author: georg.brandl Date: Thu May 4 07:08:19 2006 New Revision: 45896 Modified: python/branches/release24-maint/Lib/imputil.py Log: Bug #1481530: allow "from os.path import ..." with imputil (backport from rev. 45895) Modified: python/branches/release24-maint/Lib/imputil.py ============================================================================== --- python/branches/release24-maint/Lib/imputil.py (original) +++ python/branches/release24-maint/Lib/imputil.py Thu May 4 07:08:19 2006 @@ -131,9 +131,12 @@ if importer: return importer._finish_import(top_module, parts[1:], fromlist) - # Grrr, some people "import os.path" + # Grrr, some people "import os.path" or do "from os.path import ..." if len(parts) == 2 and hasattr(top_module, parts[1]): - return top_module + if fromlist: + return getattr(top_module, parts[1]) + else: + return top_module # If the importer does not exist, then we have to bail. A missing # importer means that something else imported the module, and we have From buildbot at python.org Thu May 4 07:38:03 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 05:38:03 +0000 Subject: [Python-checkins] buildbot warnings in hppa Ubuntu dapper 2.4 Message-ID: <20060504053803.E408C1E4006@bag.python.org> The Buildbot has detected a new failure of hppa Ubuntu dapper 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%25202.4/builds/51 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Thu May 4 07:41:41 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 05:41:41 +0000 Subject: [Python-checkins] buildbot warnings in x86 cygwin trunk Message-ID: <20060504054141.35C421E4006@bag.python.org> The Buildbot has detected a new failure of x86 cygwin trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520cygwin%2520trunk/builds/359 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Thu May 4 07:45:05 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 05:45:05 +0000 Subject: [Python-checkins] buildbot warnings in x86 OpenBSD 2.4 Message-ID: <20060504054505.410C21E4006@bag.python.org> The Buildbot has detected a new failure of x86 OpenBSD 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520OpenBSD%25202.4/builds/89 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Thu May 4 07:51:05 2006 From: python-checkins at python.org (martin.v.loewis) Date: Thu, 4 May 2006 07:51:05 +0200 (CEST) Subject: [Python-checkins] r45897 - in python/trunk: Lib/test/test_syntax.py Misc/NEWS Parser/parsetok.c Message-ID: <20060504055105.033A41E4006@bag.python.org> Author: martin.v.loewis Date: Thu May 4 07:51:03 2006 New Revision: 45897 Modified: python/trunk/Lib/test/test_syntax.py python/trunk/Misc/NEWS python/trunk/Parser/parsetok.c Log: Patch #1475845: Raise IndentationError for unexpected indent. Modified: python/trunk/Lib/test/test_syntax.py ============================================================================== --- python/trunk/Lib/test/test_syntax.py (original) +++ python/trunk/Lib/test/test_syntax.py Thu May 4 07:51:03 2006 @@ -243,15 +243,18 @@ class SyntaxTestCase(unittest.TestCase): def _check_error(self, code, errtext, - filename="", mode="exec"): + filename="", mode="exec", subclass=None): """Check that compiling code raises SyntaxError with errtext. errtest is a regular expression that must be present in the - test of the exception raised. + test of the exception raised. If subclass is specified it + is the expected subclass of SyntaxError (e.g. IndentationError). """ try: compile(code, filename, mode) except SyntaxError, err: + if subclass and not isinstance(err, subclass): + self.fail("SyntaxError is not a %s" % subclass.__name__) mo = re.search(errtext, str(err)) if mo is None: self.fail("SyntaxError did not contain '%r'" % (errtext,)) @@ -290,6 +293,19 @@ :""") self._check_error(source, "nested scope") + def test_unexpected_indent(self): + self._check_error("foo()\n bar()\n", "unexpected indent", + subclass=IndentationError) + + def test_no_indent(self): + self._check_error("if 1:\nfoo()", "expected an indented block", + subclass=IndentationError) + + def test_bad_outdent(self): + self._check_error("if 1:\n foo()\n bar()", + "unindent does not match .* level", + subclass=IndentationError) + def test_main(): test_support.run_unittest(SyntaxTestCase) from test import test_syntax Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 4 07:51:03 2006 @@ -12,6 +12,8 @@ Core and builtins ----------------- +- Patch #1475845: Raise IndentationError for unexpected indent. + - Patch #1479181: split open() and file() from being aliases for each other. - Bug #1465834: 'bdist_wininst preinstall script support' was fixed Modified: python/trunk/Parser/parsetok.c ============================================================================== --- python/trunk/Parser/parsetok.c (original) +++ python/trunk/Parser/parsetok.c Thu May 4 07:51:03 2006 @@ -194,8 +194,10 @@ if ((err_ret->error = PyParser_AddToken(ps, (int)type, str, tok->lineno, col_offset, &(err_ret->expected))) != E_OK) { - if (err_ret->error != E_DONE) + if (err_ret->error != E_DONE) { PyObject_FREE(str); + err_ret->token = type; + } break; } } From buildbot at python.org Thu May 4 07:56:16 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 05:56:16 +0000 Subject: [Python-checkins] buildbot failure in amd64 gentoo 2.4 Message-ID: <20060504055616.21C001E4006@bag.python.org> The Buildbot has detected a new failure of amd64 gentoo 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%2520gentoo%25202.4/builds/124 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl BUILD FAILED: failed failed slave lost sincerely, -The Buildbot From buildbot at python.org Thu May 4 08:44:57 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 06:44:57 +0000 Subject: [Python-checkins] buildbot warnings in x86 cygwin 2.4 Message-ID: <20060504064457.91FF51E4007@bag.python.org> The Buildbot has detected a new failure of x86 cygwin 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520cygwin%25202.4/builds/61 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: georg.brandl Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Thu May 4 12:08:44 2006 From: python-checkins at python.org (martin.v.loewis) Date: Thu, 4 May 2006 12:08:44 +0200 (CEST) Subject: [Python-checkins] r45898 - in python/trunk: Lib/test/test_os.py Lib/test/test_shutil.py Misc/NEWS Modules/posixmodule.c Message-ID: <20060504100844.5C1691E4007@bag.python.org> Author: martin.v.loewis Date: Thu May 4 12:08:42 2006 New Revision: 45898 Modified: python/trunk/Lib/test/test_os.py python/trunk/Lib/test/test_shutil.py python/trunk/Misc/NEWS python/trunk/Modules/posixmodule.c Log: Implement os.{chdir,rename,rmdir,remove} using Win32 directly. Modified: python/trunk/Lib/test/test_os.py ============================================================================== --- python/trunk/Lib/test/test_os.py (original) +++ python/trunk/Lib/test/test_os.py Thu May 4 12:08:42 2006 @@ -5,6 +5,7 @@ import os import unittest import warnings +import sys from test import test_support warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__) @@ -364,6 +365,20 @@ except NotImplementedError: pass +class Win32ErrorTests(unittest.TestCase): + def test_rename(self): + self.assertRaises(WindowsError, os.rename, test_support.TESTFN, test_support.TESTFN+".bak") + + def test_remove(self): + self.assertRaises(WindowsError, os.remove, test_support.TESTFN) + + def test_chdir(self): + self.assertRaises(WindowsError, os.chdir, test_support.TESTFN) + +if sys.platform != 'win32': + class Win32ErrorTests(unittest.TestCase): + pass + def test_main(): test_support.run_unittest( TemporaryFileTests, @@ -372,7 +387,8 @@ WalkTests, MakedirTests, DevNullTests, - URandomTests + URandomTests, + Win32ErrorTests ) if __name__ == "__main__": Modified: python/trunk/Lib/test/test_shutil.py ============================================================================== --- python/trunk/Lib/test/test_shutil.py (original) +++ python/trunk/Lib/test/test_shutil.py Thu May 4 12:08:42 2006 @@ -48,12 +48,12 @@ if self.errorState == 0: self.assertEqual(func, os.remove) self.assertEqual(arg, self.childpath) - self.assertEqual(exc[0], OSError) + self.failUnless(issubclass(exc[0], OSError)) self.errorState = 1 else: self.assertEqual(func, os.rmdir) self.assertEqual(arg, TESTFN) - self.assertEqual(exc[0], OSError) + self.failUnless(issubclass(exc[0], OSError)) self.errorState = 2 def test_rmtree_dont_delete_file(self): Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu May 4 12:08:42 2006 @@ -67,6 +67,9 @@ Extension Modules ----------------- +- Use Win32 API to implement os.{chdir,rename,rmdir,remove}. As a result, + these functions now raise WindowsError instead of OSError. + - Calling Tk_Init twice is refused if the first call failed as that may deadlock. Modified: python/trunk/Modules/posixmodule.c ============================================================================== --- python/trunk/Modules/posixmodule.c (original) +++ python/trunk/Modules/posixmodule.c Thu May 4 12:08:42 2006 @@ -458,21 +458,29 @@ static PyObject *_PyUnicode_FromFileSystemEncodedObject(register PyObject *obj) { - /* XXX Perhaps we should make this API an alias of - PyObject_Unicode() instead ?! */ - if (PyUnicode_CheckExact(obj)) { - Py_INCREF(obj); - return obj; - } - if (PyUnicode_Check(obj)) { +} + +/* Function suitable for O& conversion */ +static int +convert_to_unicode(PyObject *arg, void* _param) +{ + PyObject **param = (PyObject**)_param; + if (PyUnicode_CheckExact(arg)) { + Py_INCREF(arg); + *param = arg; + } + else if (PyUnicode_Check(arg)) { /* For a Unicode subtype that's not a Unicode object, return a true Unicode object with the same data. */ - return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(obj), - PyUnicode_GET_SIZE(obj)); + *param = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(arg), + PyUnicode_GET_SIZE(arg)); + return *param != NULL; } - return PyUnicode_FromEncodedObject(obj, - Py_FileSystemDefaultEncoding, - "strict"); + else + *param = PyUnicode_FromEncodedObject(arg, + Py_FileSystemDefaultEncoding, + "strict"); + return (*param) != NULL; } #endif /* Py_WIN_WIDE_FILENAMES */ @@ -589,35 +597,10 @@ #endif static PyObject * -posix_1str(PyObject *args, char *format, int (*func)(const char*), - char *wformat, int (*wfunc)(const Py_UNICODE*)) +posix_1str(PyObject *args, char *format, int (*func)(const char*)) { char *path1 = NULL; int res; -#ifdef Py_WIN_WIDE_FILENAMES - if (unicode_file_names()) { - PyUnicodeObject *po; - if (PyArg_ParseTuple(args, wformat, &po)) { - Py_BEGIN_ALLOW_THREADS - /* PyUnicode_AS_UNICODE OK without thread - lock as it is a simple dereference. */ - res = (*wfunc)(PyUnicode_AS_UNICODE(po)); - Py_END_ALLOW_THREADS - if (res < 0) - return posix_error_with_unicode_filename(PyUnicode_AS_UNICODE(po)); - Py_INCREF(Py_None); - return Py_None; - } - /* Drop the argument parsing error as narrow - strings are also valid. */ - PyErr_Clear(); - } -#else - /* Platforms that don't support Unicode filenames - shouldn't be passing these extra params */ - assert(wformat==NULL && wfunc == NULL); -#endif - if (!PyArg_ParseTuple(args, format, Py_FileSystemDefaultEncoding, &path1)) return NULL; @@ -634,52 +617,10 @@ static PyObject * posix_2str(PyObject *args, char *format, - int (*func)(const char *, const char *), - char *wformat, - int (*wfunc)(const Py_UNICODE *, const Py_UNICODE *)) + int (*func)(const char *, const char *)) { char *path1 = NULL, *path2 = NULL; int res; -#ifdef Py_WIN_WIDE_FILENAMES - if (unicode_file_names()) { - PyObject *po1; - PyObject *po2; - if (PyArg_ParseTuple(args, wformat, &po1, &po2)) { - if (PyUnicode_Check(po1) || PyUnicode_Check(po2)) { - PyObject *wpath1; - PyObject *wpath2; - wpath1 = _PyUnicode_FromFileSystemEncodedObject(po1); - wpath2 = _PyUnicode_FromFileSystemEncodedObject(po2); - if (!wpath1 || !wpath2) { - Py_XDECREF(wpath1); - Py_XDECREF(wpath2); - return NULL; - } - Py_BEGIN_ALLOW_THREADS - /* PyUnicode_AS_UNICODE OK without thread - lock as it is a simple dereference. */ - res = (*wfunc)(PyUnicode_AS_UNICODE(wpath1), - PyUnicode_AS_UNICODE(wpath2)); - Py_END_ALLOW_THREADS - Py_XDECREF(wpath1); - Py_XDECREF(wpath2); - if (res != 0) - return posix_error(); - Py_INCREF(Py_None); - return Py_None; - } - /* Else flow through as neither is Unicode. */ - } - /* Drop the argument parsing error as narrow - strings are also valid. */ - PyErr_Clear(); - } -#else - /* Platforms that don't support Unicode filenames - shouldn't be passing these extra params */ - assert(wformat==NULL && wfunc == NULL); -#endif - if (!PyArg_ParseTuple(args, format, Py_FileSystemDefaultEncoding, &path1, Py_FileSystemDefaultEncoding, &path2)) @@ -696,6 +637,101 @@ return Py_None; } +#ifdef Py_WIN_WIDE_FILENAMES +static PyObject* +win32_1str(PyObject* args, char* func, + char* format, BOOL (__stdcall *funcA)(LPCSTR), + char* wformat, BOOL (__stdcall *funcW)(LPWSTR)) +{ + PyObject *uni; + char *ansi; + BOOL result; + if (unicode_file_names()) { + if (!PyArg_ParseTuple(args, wformat, &uni)) + PyErr_Clear(); + else { + Py_BEGIN_ALLOW_THREADS + result = funcW(PyUnicode_AsUnicode(uni)); + Py_END_ALLOW_THREADS + if (!result) + return win32_error_unicode(func, PyUnicode_AsUnicode(uni)); + Py_INCREF(Py_None); + return Py_None; + } + } + if (!PyArg_ParseTuple(args, format, &ansi)) + return NULL; + Py_BEGIN_ALLOW_THREADS + result = funcA(ansi); + Py_END_ALLOW_THREADS + if (!result) + return win32_error(func, ansi); + Py_INCREF(Py_None); + return Py_None; + +} + +/* This is a reimplementation of the C library's chdir function, + but one that produces Win32 errors instead of DOS error codes. + chdir is essentially a wrapper around SetCurrentDirectory; however, + it also needs to set "magic" environment variables indicating + the per-drive current directory, which are of the form =: */ +BOOL __stdcall +win32_chdir(LPCSTR path) +{ + char new_path[MAX_PATH+1]; + int result; + char env[4] = "=x:"; + + if(!SetCurrentDirectoryA(path)) + return FALSE; + result = GetCurrentDirectoryA(MAX_PATH+1, new_path); + if (!result) + return FALSE; + /* In the ANSI API, there should not be any paths longer + than MAX_PATH. */ + assert(result <= MAX_PATH+1); + if (strncmp(new_path, "\\\\", 2) == 0 || + strncmp(new_path, "//", 2) == 0) + /* UNC path, nothing to do. */ + return TRUE; + env[1] = new_path[0]; + return SetEnvironmentVariableA(env, new_path); +} + +/* The Unicode version differs from the ANSI version + since the current directory might exceed MAX_PATH characters */ +BOOL __stdcall +win32_wchdir(LPCWSTR path) +{ + wchar_t _new_path[MAX_PATH+1], *new_path = _new_path; + int result; + wchar_t env[4] = L"=x:"; + + if(!SetCurrentDirectoryW(path)) + return FALSE; + result = GetCurrentDirectoryW(MAX_PATH+1, new_path); + if (!result) + return FALSE; + if (result > MAX_PATH+1) { + new_path = malloc(result); + if (!new_path) { + SetLastError(ERROR_OUTOFMEMORY); + return FALSE; + } + } + if (wcsncmp(new_path, L"\\\\", 2) == 0 || + wcsncmp(new_path, L"//", 2) == 0) + /* UNC path, nothing to do. */ + return TRUE; + env[1] = new_path[0]; + result = SetEnvironmentVariableW(env, new_path); + if (new_path != _new_path) + free(new_path); + return result; +} +#endif + #ifdef MS_WINDOWS /* The CRT of Windows has a number of flaws wrt. its stat() implementation: - time stamps are restricted to second resolution @@ -1410,14 +1446,13 @@ posix_chdir(PyObject *self, PyObject *args) { #ifdef MS_WINDOWS - return posix_1str(args, "et:chdir", chdir, "U:chdir", _wchdir); + return win32_1str(args, "chdir", "s:chdir", win32_chdir, "U:chdir", win32_wchdir); #elif defined(PYOS_OS2) && defined(PYCC_GCC) - return posix_1str(args, "et:chdir", _chdir2, NULL, NULL); + return posix_1str(args, "et:chdir", _chdir2); #elif defined(__VMS) - return posix_1str(args, "et:chdir", (int (*)(const char *))chdir, - NULL, NULL); + return posix_1str(args, "et:chdir", (int (*)(const char *))chdir); #else - return posix_1str(args, "et:chdir", chdir, NULL, NULL); + return posix_1str(args, "et:chdir", chdir); #endif } @@ -1485,7 +1520,7 @@ static PyObject * posix_chroot(PyObject *self, PyObject *args) { - return posix_1str(args, "et:chroot", chroot, NULL, NULL); + return posix_1str(args, "et:chroot", chroot); } #endif @@ -2071,7 +2106,6 @@ } #endif /* HAVE_NICE */ - PyDoc_STRVAR(posix_rename__doc__, "rename(old, new)\n\n\ Rename a file or directory."); @@ -2080,7 +2114,36 @@ posix_rename(PyObject *self, PyObject *args) { #ifdef MS_WINDOWS - return posix_2str(args, "etet:rename", rename, "OO:rename", _wrename); + PyObject *o1, *o2; + char *p1, *p2; + BOOL result; + if (unicode_file_names()) { + if (!PyArg_ParseTuple(args, "O&O&:rename", + convert_to_unicode, &o1, + convert_to_unicode, &o2)) + PyErr_Clear(); + else { + Py_BEGIN_ALLOW_THREADS + result = MoveFileW(PyUnicode_AsUnicode(o1), + PyUnicode_AsUnicode(o2)); + Py_END_ALLOW_THREADS + Py_DECREF(o1); + Py_DECREF(o2); + if (!result) + return win32_error("rename", NULL); + Py_INCREF(Py_None); + return Py_None; + } + } + if (!PyArg_ParseTuple(args, "ss:rename", &p1, &p2)) + return NULL; + Py_BEGIN_ALLOW_THREADS + result = MoveFileA(p1, p2); + Py_END_ALLOW_THREADS + if (!result) + return win32_error("rename", NULL); + Py_INCREF(Py_None); + return Py_None; #else return posix_2str(args, "etet:rename", rename, NULL, NULL); #endif @@ -2095,9 +2158,9 @@ posix_rmdir(PyObject *self, PyObject *args) { #ifdef MS_WINDOWS - return posix_1str(args, "et:rmdir", rmdir, "U:rmdir", _wrmdir); + return win32_1str(args, "rmdir", "s:rmdir", RemoveDirectoryA, "U:rmdir", RemoveDirectoryW); #else - return posix_1str(args, "et:rmdir", rmdir, NULL, NULL); + return posix_1str(args, "et:rmdir", rmdir); #endif } @@ -2166,9 +2229,9 @@ posix_unlink(PyObject *self, PyObject *args) { #ifdef MS_WINDOWS - return posix_1str(args, "et:remove", unlink, "U:remove", _wunlink); + return win32_1str(args, "remove", "s:remove", DeleteFileA, "U:remove", DeleteFileW); #else - return posix_1str(args, "et:remove", unlink, NULL, NULL); + return posix_1str(args, "et:remove", unlink); #endif } From buildbot at python.org Thu May 4 12:14:39 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:14:39 +0000 Subject: [Python-checkins] buildbot failure in ia64 Debian unstable trunk Message-ID: <20060504101439.228B21E4007@bag.python.org> The Buildbot has detected a new failure of ia64 Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ia64%2520Debian%2520unstable%2520trunk/builds/351 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:14:43 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:14:43 +0000 Subject: [Python-checkins] buildbot failure in ppc Debian unstable trunk Message-ID: <20060504101443.B96451E4007@bag.python.org> The Buildbot has detected a new failure of ppc Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ppc%2520Debian%2520unstable%2520trunk/builds/369 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:14:45 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:14:45 +0000 Subject: [Python-checkins] buildbot failure in x86 gentoo trunk Message-ID: <20060504101445.3D9BF1E4019@bag.python.org> The Buildbot has detected a new failure of x86 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520gentoo%2520trunk/builds/710 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:15:09 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:15:09 +0000 Subject: [Python-checkins] buildbot failure in x86 OpenBSD trunk Message-ID: <20060504101509.305D81E4007@bag.python.org> The Buildbot has detected a new failure of x86 OpenBSD trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520OpenBSD%2520trunk/builds/543 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:15:14 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:15:14 +0000 Subject: [Python-checkins] buildbot failure in amd64 gentoo trunk Message-ID: <20060504101514.746C71E4007@bag.python.org> The Buildbot has detected a new failure of amd64 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%2520gentoo%2520trunk/builds/729 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:15:48 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:15:48 +0000 Subject: [Python-checkins] buildbot failure in g4 osx.4 trunk Message-ID: <20060504101548.BD08C1E4007@bag.python.org> The Buildbot has detected a new failure of g4 osx.4 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/g4%2520osx.4%2520trunk/builds/630 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:16:05 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:16:05 +0000 Subject: [Python-checkins] buildbot failure in alpha Debian trunk Message-ID: <20060504101605.E82651E4007@bag.python.org> The Buildbot has detected a new failure of alpha Debian trunk. Full details are available at: http://www.python.org/dev/buildbot/all/alpha%2520Debian%2520trunk/builds/84 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:16:19 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:16:19 +0000 Subject: [Python-checkins] buildbot failure in sparc solaris10 gcc trunk Message-ID: <20060504101619.713FB1E4007@bag.python.org> The Buildbot has detected a new failure of sparc solaris10 gcc trunk. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%2520solaris10%2520gcc%2520trunk/builds/635 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:16:22 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:16:22 +0000 Subject: [Python-checkins] buildbot failure in hppa Ubuntu dapper trunk Message-ID: <20060504101622.B5C241E400B@bag.python.org> The Buildbot has detected a new failure of hppa Ubuntu dapper trunk. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%2520trunk/builds/364 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:16:37 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:16:37 +0000 Subject: [Python-checkins] buildbot failure in alpha Tru64 5.1 trunk Message-ID: <20060504101637.6232D1E4007@bag.python.org> 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/builds/425 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:20:16 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:20:16 +0000 Subject: [Python-checkins] buildbot failure in x86 cygwin trunk Message-ID: <20060504102016.807331E4007@bag.python.org> The Buildbot has detected a new failure of x86 cygwin trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520cygwin%2520trunk/builds/361 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:20:21 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:20:21 +0000 Subject: [Python-checkins] buildbot failure in x86 Ubuntu dapper (icc) trunk Message-ID: <20060504102021.2D2641E4007@bag.python.org> The Buildbot has detected a new failure of x86 Ubuntu dapper (icc) trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520dapper%2520%2528icc%2529%2520trunk/builds/323 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis BUILD FAILED: failed compile sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:36:36 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:36:36 +0000 Subject: [Python-checkins] buildbot warnings in x86 W2k trunk Message-ID: <20060504103636.7DD171E4007@bag.python.org> The Buildbot has detected a new failure of x86 W2k trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520W2k%2520trunk/builds/646 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Thu May 4 12:43:19 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 10:43:19 +0000 Subject: [Python-checkins] buildbot warnings in x86 XP trunk Message-ID: <20060504104319.3AE2F1E4007@bag.python.org> The Buildbot has detected a new failure of x86 XP trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520XP%2520trunk/builds/655 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Thu May 4 14:04:28 2006 From: python-checkins at python.org (martin.v.loewis) Date: Thu, 4 May 2006 14:04:28 +0200 (CEST) Subject: [Python-checkins] r45899 - python/trunk/Modules/posixmodule.c Message-ID: <20060504120428.932661E4015@bag.python.org> Author: martin.v.loewis Date: Thu May 4 14:04:27 2006 New Revision: 45899 Modified: python/trunk/Modules/posixmodule.c Log: Drop now-unnecessary arguments to posix_2str. Modified: python/trunk/Modules/posixmodule.c ============================================================================== --- python/trunk/Modules/posixmodule.c (original) +++ python/trunk/Modules/posixmodule.c Thu May 4 14:04:27 2006 @@ -1679,7 +1679,7 @@ static PyObject * posix_link(PyObject *self, PyObject *args) { - return posix_2str(args, "etet:link", link, NULL, NULL); + return posix_2str(args, "etet:link", link); } #endif /* HAVE_LINK */ @@ -2145,7 +2145,7 @@ Py_INCREF(Py_None); return Py_None; #else - return posix_2str(args, "etet:rename", rename, NULL, NULL); + return posix_2str(args, "etet:rename", rename); #endif } @@ -5420,7 +5420,7 @@ static PyObject * posix_symlink(PyObject *self, PyObject *args) { - return posix_2str(args, "etet:symlink", symlink, NULL, NULL); + return posix_2str(args, "etet:symlink", symlink); } #endif /* HAVE_SYMLINK */ From buildbot at python.org Thu May 4 14:22:42 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 12:22:42 +0000 Subject: [Python-checkins] buildbot warnings in x86 cygwin trunk Message-ID: <20060504122242.2D6691E4007@bag.python.org> The Buildbot has detected a new failure of x86 cygwin trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520cygwin%2520trunk/builds/362 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Thu May 4 15:11:09 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 13:11:09 +0000 Subject: [Python-checkins] buildbot warnings in x86 Ubuntu dapper (icc) trunk Message-ID: <20060504131109.639161E4015@bag.python.org> The Buildbot has detected a new failure of x86 Ubuntu dapper (icc) trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%2520Ubuntu%2520dapper%2520%2528icc%2529%2520trunk/builds/324 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Thu May 4 15:14:45 2006 From: buildbot at python.org (buildbot at python.org) Date: Thu, 04 May 2006 13:14:45 +0000 Subject: [Python-checkins] buildbot warnings in hppa Ubuntu dapper trunk Message-ID: <20060504131445.49C261E4002@bag.python.org> The Buildbot has detected a new failure of hppa Ubuntu dapper trunk. Full details are available at: http://www.python.org/dev/buildbot/all/hppa%2520Ubuntu%2520dapper%2520trunk/builds/365 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: martin.v.loewis Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Thu May 4 16:27:52 2006 From: python-checkins at python.org (martin.v.loewis) Date: Thu, 4 May 2006 16:27:52 +0200 (CEST) Subject: [Python-checkins] r45900 - python/trunk/Lib/mailbox.py Message-ID: <20060504142752.9D7CC1E4002@bag.python.org> Author: martin.v.loewis Date: Thu May 4 16:27:52 2006 New Revision: 45900 Modified: python/trunk/Lib/mailbox.py Log: Update checks to consider Windows error numbers. Modified: python/trunk/Lib/mailbox.py ============================================================================== --- python/trunk/Lib/mailbox.py (original) +++ python/trunk/Lib/mailbox.py Thu May 4 16:27:52 2006 @@ -2,6 +2,7 @@ """Read/write support for Maildir, mbox, MH, Babyl, and MMDF mailboxes.""" +import sys import os import time import calendar @@ -23,6 +24,11 @@ 'BabylMessage', 'MMDFMessage', 'UnixMailbox', 'PortableUnixMailbox', 'MmdfMailbox', 'MHMailbox', 'BabylMailbox' ] +if sys.platform != 'win32': + # Define WindowsError so that we can use it in an except statement + # even on non-Windows systems + class WindowsError: + pass class Mailbox: """A group of messages in a particular place.""" @@ -262,10 +268,11 @@ self.remove(key) except KeyError: pass + except WindowsError, e: + if e.errno != 2: # ERROR_FILE_NOT_FOUND + raise except OSError, e: - if e.errno == errno.ENOENT: - pass - else: + if e.errno != errno.ENOENT: raise def __setitem__(self, key, message): @@ -419,6 +426,12 @@ path = os.path.join(self._path, 'tmp', uniq) try: os.stat(path) + except WindowsError, e: + if e.errno == 2: # ERROR_FILE_NOT_FOUND + Maildir._count += 1 + return open(path, 'wb+') + else: + raise except OSError, e: if e.errno == errno.ENOENT: Maildir._count += 1 @@ -566,6 +579,12 @@ self._file.close() try: os.rename(new_file.name, self._path) + except WindowsError, e: + if e.errno == 183: # ERROR_ALREADY_EXISTS + os.remove(self._path) + os.rename(new_file.name, self._path) + else: + raise except OSError, e: if e.errno == errno.EEXIST: os.remove(self._path) @@ -1837,6 +1856,13 @@ else: os.rename(pre_lock.name, f.name + '.lock') dotlock_done = True + except WindowsError, e: + if e.errno == 183: # ERROR_ALREADY_EXISTS + os.remove(pre_lock.name) + raise ExternalClashError('dot lock unavailable: %s' % + f.name) + else: + raise except OSError, e: if e.errno == errno.EEXIST: os.remove(pre_lock.name) From python-checkins at python.org Thu May 4 18:52:46 2006 From: python-checkins at python.org (richard.tew) Date: Thu, 4 May 2006 18:52:46 +0200 (CEST) Subject: [Python-checkins] r45901 - stackless/Python-2.4.3/dev/Stackless/pickling/prickelpit.c Message-ID: <20060504165246.4BD7B1E4007@bag.python.org> Author: richard.tew Date: Thu May 4 18:52:45 2006 New Revision: 45901 Modified: stackless/Python-2.4.3/dev/Stackless/pickling/prickelpit.c Log: Fix for the failing Stackless unittest TestConcretePickledTasklets. The problem was the new dictionary iterator reduce functions I had written badly wrapped the sequence iterator (they used the iterator itself, rather than the wrapped stackless version). Modified: stackless/Python-2.4.3/dev/Stackless/pickling/prickelpit.c ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/pickling/prickelpit.c (original) +++ stackless/Python-2.4.3/dev/Stackless/pickling/prickelpit.c Thu May 4 18:52:45 2006 @@ -1415,11 +1415,11 @@ } } /* masquerade as a PySeqIter */ - tup = Py_BuildValue("(O(lO))", - &PySeqIter_Type, - 0, - list - ); + tup = Py_BuildValue("(O(Ol)())", + &wrap_PySeqIter_Type, + list, + 0 + ); Py_DECREF(list); return tup; } @@ -1455,11 +1455,11 @@ } } /* masquerade as a PySeqIter */ - tup = Py_BuildValue("(O(lO))", - &PySeqIter_Type, - 0, - list - ); + tup = Py_BuildValue("(O(Ol)())", + &wrap_PySeqIter_Type, + list, + 0 + ); Py_DECREF(list); return tup; } @@ -1502,60 +1502,15 @@ } } /* masquerade as a PySeqIter */ - tup = Py_BuildValue("(O(lO))", - &PySeqIter_Type, - 0, - list - ); + tup = Py_BuildValue("(O(Ol)())", + &wrap_PySeqIter_Type, + list, + 0 + ); Py_DECREF(list); return tup; } -#if 0 -static PyObject * -dictiter_reduce(dictiterobject *di) -{ - PyObject *tup, *list, *key, *value, *res; - int i; - - /* Make a list big enough to exhaust the dict */ - list = PyList_New(0); - if (list == NULL) - return PyErr_NoMemory(); - - /* is this dictiter is already exhausted? */ - if (di->di_dict != NULL) { - if (di->di_used != di->di_dict->ma_used) { - PyErr_SetString(PyExc_RuntimeError, - "dictionary changed size during iteration"); - di->di_used = -1; /* Make this state sticky */ - return NULL; - } - i = di->di_pos; - while (PyDict_Next((PyObject *)di->di_dict, &i, &key, - &value)) { - res = (*di->di_select)(key, value); - if (res == NULL) { - Py_DECREF(list); - return NULL; - } - if (PyList_Append(list, res) == -1) { - return NULL; - } - Py_DECREF(res); - } - } - /* masquerade as a PySeqIter */ - tup = Py_BuildValue("(O(Ol)())", - &wrap_PySeqIter_Type, - list, - 0 - ); - Py_DECREF(list); - return tup; -} -#endif - static PyTypeObject wrap_PyDictIterKey_Type; MAKE_WRAPPERTYPE(PyDictIterKey_Type, dictiterkey, "dictionary-keyiterator", From guido at python.org Thu May 4 19:00:04 2006 From: guido at python.org (Guido van Rossum) Date: Thu, 4 May 2006 10:00:04 -0700 Subject: [Python-checkins] r45898 - in python/trunk: Lib/test/test_os.py Lib/test/test_shutil.py Misc/NEWS Modules/posixmodule.c In-Reply-To: <20060504100844.5C1691E4007@bag.python.org> References: <20060504100844.5C1691E4007@bag.python.org> Message-ID: I wonder if it's time to move the Win32 code out of posixmodule.c? It seems the current mess of #ifdefs can't be very maintainable. On 5/4/06, martin.v.loewis wrote: > Author: martin.v.loewis > Date: Thu May 4 12:08:42 2006 > New Revision: 45898 > > Modified: > python/trunk/Lib/test/test_os.py > python/trunk/Lib/test/test_shutil.py > python/trunk/Misc/NEWS > python/trunk/Modules/posixmodule.c > Log: > Implement os.{chdir,rename,rmdir,remove} using Win32 directly. > > Modified: python/trunk/Lib/test/test_os.py > ============================================================================== > --- python/trunk/Lib/test/test_os.py (original) > +++ python/trunk/Lib/test/test_os.py Thu May 4 12:08:42 2006 > @@ -5,6 +5,7 @@ > import os > import unittest > import warnings > +import sys > from test import test_support > > warnings.filterwarnings("ignore", "tempnam", RuntimeWarning, __name__) > @@ -364,6 +365,20 @@ > except NotImplementedError: > pass > > +class Win32ErrorTests(unittest.TestCase): > + def test_rename(self): > + self.assertRaises(WindowsError, os.rename, test_support.TESTFN, test_support.TESTFN+".bak") > + > + def test_remove(self): > + self.assertRaises(WindowsError, os.remove, test_support.TESTFN) > + > + def test_chdir(self): > + self.assertRaises(WindowsError, os.chdir, test_support.TESTFN) > + > +if sys.platform != 'win32': > + class Win32ErrorTests(unittest.TestCase): > + pass > + > def test_main(): > test_support.run_unittest( > TemporaryFileTests, > @@ -372,7 +387,8 @@ > WalkTests, > MakedirTests, > DevNullTests, > - URandomTests > + URandomTests, > + Win32ErrorTests > ) > > if __name__ == "__main__": > > Modified: python/trunk/Lib/test/test_shutil.py > ============================================================================== > --- python/trunk/Lib/test/test_shutil.py (original) > +++ python/trunk/Lib/test/test_shutil.py Thu May 4 12:08:42 2006 > @@ -48,12 +48,12 @@ > if self.errorState == 0: > self.assertEqual(func, os.remove) > self.assertEqual(arg, self.childpath) > - self.assertEqual(exc[0], OSError) > + self.failUnless(issubclass(exc[0], OSError)) > self.errorState = 1 > else: > self.assertEqual(func, os.rmdir) > self.assertEqual(arg, TESTFN) > - self.assertEqual(exc[0], OSError) > + self.failUnless(issubclass(exc[0], OSError)) > self.errorState = 2 > > def test_rmtree_dont_delete_file(self): > > Modified: python/trunk/Misc/NEWS > ============================================================================== > --- python/trunk/Misc/NEWS (original) > +++ python/trunk/Misc/NEWS Thu May 4 12:08:42 2006 > @@ -67,6 +67,9 @@ > Extension Modules > ----------------- > > +- Use Win32 API to implement os.{chdir,rename,rmdir,remove}. As a result, > + these functions now raise WindowsError instead of OSError. > + > - Calling Tk_Init twice is refused if the first call failed as that > may deadlock. > > > Modified: python/trunk/Modules/posixmodule.c > ============================================================================== > --- python/trunk/Modules/posixmodule.c (original) > +++ python/trunk/Modules/posixmodule.c Thu May 4 12:08:42 2006 > @@ -458,21 +458,29 @@ > > static PyObject *_PyUnicode_FromFileSystemEncodedObject(register PyObject *obj) > { > - /* XXX Perhaps we should make this API an alias of > - PyObject_Unicode() instead ?! */ > - if (PyUnicode_CheckExact(obj)) { > - Py_INCREF(obj); > - return obj; > - } > - if (PyUnicode_Check(obj)) { > +} > + > +/* Function suitable for O& conversion */ > +static int > +convert_to_unicode(PyObject *arg, void* _param) > +{ > + PyObject **param = (PyObject**)_param; > + if (PyUnicode_CheckExact(arg)) { > + Py_INCREF(arg); > + *param = arg; > + } > + else if (PyUnicode_Check(arg)) { > /* For a Unicode subtype that's not a Unicode object, > return a true Unicode object with the same data. */ > - return PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(obj), > - PyUnicode_GET_SIZE(obj)); > + *param = PyUnicode_FromUnicode(PyUnicode_AS_UNICODE(arg), > + PyUnicode_GET_SIZE(arg)); > + return *param != NULL; > } > - return PyUnicode_FromEncodedObject(obj, > - Py_FileSystemDefaultEncoding, > - "strict"); > + else > + *param = PyUnicode_FromEncodedObject(arg, > + Py_FileSystemDefaultEncoding, > + "strict"); > + return (*param) != NULL; > } > > #endif /* Py_WIN_WIDE_FILENAMES */ > @@ -589,35 +597,10 @@ > #endif > > static PyObject * > -posix_1str(PyObject *args, char *format, int (*func)(const char*), > - char *wformat, int (*wfunc)(const Py_UNICODE*)) > +posix_1str(PyObject *args, char *format, int (*func)(const char*)) > { > char *path1 = NULL; > int res; > -#ifdef Py_WIN_WIDE_FILENAMES > - if (unicode_file_names()) { > - PyUnicodeObject *po; > - if (PyArg_ParseTuple(args, wformat, &po)) { > - Py_BEGIN_ALLOW_THREADS > - /* PyUnicode_AS_UNICODE OK without thread > - lock as it is a simple dereference. */ > - res = (*wfunc)(PyUnicode_AS_UNICODE(po)); > - Py_END_ALLOW_THREADS > - if (res < 0) > - return posix_error_with_unicode_filename(PyUnicode_AS_UNICODE(po)); > - Py_INCREF(Py_None); > - return Py_None; > - } > - /* Drop the argument parsing error as narrow > - strings are also valid. */ > - PyErr_Clear(); > - } > -#else > - /* Platforms that don't support Unicode filenames > - shouldn't be passing these extra params */ > - assert(wformat==NULL && wfunc == NULL); > -#endif > - > if (!PyArg_ParseTuple(args, format, > Py_FileSystemDefaultEncoding, &path1)) > return NULL; > @@ -634,52 +617,10 @@ > static PyObject * > posix_2str(PyObject *args, > char *format, > - int (*func)(const char *, const char *), > - char *wformat, > - int (*wfunc)(const Py_UNICODE *, const Py_UNICODE *)) > + int (*func)(const char *, const char *)) > { > char *path1 = NULL, *path2 = NULL; > int res; > -#ifdef Py_WIN_WIDE_FILENAMES > - if (unicode_file_names()) { > - PyObject *po1; > - PyObject *po2; > - if (PyArg_ParseTuple(args, wformat, &po1, &po2)) { > - if (PyUnicode_Check(po1) || PyUnicode_Check(po2)) { > - PyObject *wpath1; > - PyObject *wpath2; > - wpath1 = _PyUnicode_FromFileSystemEncodedObject(po1); > - wpath2 = _PyUnicode_FromFileSystemEncodedObject(po2); > - if (!wpath1 || !wpath2) { > - Py_XDECREF(wpath1); > - Py_XDECREF(wpath2); > - return NULL; > - } > - Py_BEGIN_ALLOW_THREADS > - /* PyUnicode_AS_UNICODE OK without thread > - lock as it is a simple dereference. */ > - res = (*wfunc)(PyUnicode_AS_UNICODE(wpath1), > - PyUnicode_AS_UNICODE(wpath2)); > - Py_END_ALLOW_THREADS > - Py_XDECREF(wpath1); > - Py_XDECREF(wpath2); > - if (res != 0) > - return posix_error(); > - Py_INCREF(Py_None); > - return Py_None; > - } > - /* Else flow through as neither is Unicode. */ > - } > - /* Drop the argument parsing error as narrow > - strings are also valid. */ > - PyErr_Clear(); > - } > -#else > - /* Platforms that don't support Unicode filenames > - shouldn't be passing these extra params */ > - assert(wformat==NULL && wfunc == NULL); > -#endif > - > if (!PyArg_ParseTuple(args, format, > Py_FileSystemDefaultEncoding, &path1, > Py_FileSystemDefaultEncoding, &path2)) > @@ -696,6 +637,101 @@ > return Py_None; > } > > +#ifdef Py_WIN_WIDE_FILENAMES > +static PyObject* > +win32_1str(PyObject* args, char* func, > + char* format, BOOL (__stdcall *funcA)(LPCSTR), > + char* wformat, BOOL (__stdcall *funcW)(LPWSTR)) > +{ > + PyObject *uni; > + char *ansi; > + BOOL result; > + if (unicode_file_names()) { > + if (!PyArg_ParseTuple(args, wformat, &uni)) > + PyErr_Clear(); > + else { > + Py_BEGIN_ALLOW_THREADS > + result = funcW(PyUnicode_AsUnicode(uni)); > + Py_END_ALLOW_THREADS > + if (!result) > + return win32_error_unicode(func, PyUnicode_AsUnicode(uni)); > + Py_INCREF(Py_None); > + return Py_None; > + } > + } > + if (!PyArg_ParseTuple(args, format, &ansi)) > + return NULL; > + Py_BEGIN_ALLOW_THREADS > + result = funcA(ansi); > + Py_END_ALLOW_THREADS > + if (!result) > + return win32_error(func, ansi); > + Py_INCREF(Py_None); > + return Py_None; > + > +} > + > +/* This is a reimplementation of the C library's chdir function, > + but one that produces Win32 errors instead of DOS error codes. > + chdir is essentially a wrapper around SetCurrentDirectory; however, > + it also needs to set "magic" environment variables indicating > + the per-drive current directory, which are of the form =: */ > +BOOL __stdcall > +win32_chdir(LPCSTR path) > +{ > + char new_path[MAX_PATH+1]; > + int result; > + char env[4] = "=x:"; > + > + if(!SetCurrentDirectoryA(path)) > + return FALSE; > + result = GetCurrentDirectoryA(MAX_PATH+1, new_path); > + if (!result) > + return FALSE; > + /* In the ANSI API, there should not be any paths longer > + than MAX_PATH. */ > + assert(result <= MAX_PATH+1); > + if (strncmp(new_path, "\\\\", 2) == 0 || > + strncmp(new_path, "//", 2) == 0) > + /* UNC path, nothing to do. */ > + return TRUE; > + env[1] = new_path[0]; > + return SetEnvironmentVariableA(env, new_path); > +} > + > +/* The Unicode version differs from the ANSI version > + since the current directory might exceed MAX_PATH characters */ > +BOOL __stdcall > +win32_wchdir(LPCWSTR path) > +{ > + wchar_t _new_path[MAX_PATH+1], *new_path = _new_path; > + int result; > + wchar_t env[4] = L"=x:"; > + > + if(!SetCurrentDirectoryW(path)) > + return FALSE; > + result = GetCurrentDirectoryW(MAX_PATH+1, new_path); > + if (!result) > + return FALSE; > + if (result > MAX_PATH+1) { > + new_path = malloc(result); > + if (!new_path) { > + SetLastError(ERROR_OUTOFMEMORY); > + return FALSE; > + } > + } > + if (wcsncmp(new_path, L"\\\\", 2) == 0 || > + wcsncmp(new_path, L"//", 2) == 0) > + /* UNC path, nothing to do. */ > + return TRUE; > + env[1] = new_path[0]; > + result = SetEnvironmentVariableW(env, new_path); > + if (new_path != _new_path) > + free(new_path); > + return result; > +} > +#endif > + > #ifdef MS_WINDOWS > /* The CRT of Windows has a number of flaws wrt. its stat() implementation: > - time stamps are restricted to second resolution > @@ -1410,14 +1446,13 @@ > posix_chdir(PyObject *self, PyObject *args) > { > #ifdef MS_WINDOWS > - return posix_1str(args, "et:chdir", chdir, "U:chdir", _wchdir); > + return win32_1str(args, "chdir", "s:chdir", win32_chdir, "U:chdir", win32_wchdir); > #elif defined(PYOS_OS2) && defined(PYCC_GCC) > - return posix_1str(args, "et:chdir", _chdir2, NULL, NULL); > + return posix_1str(args, "et:chdir", _chdir2); > #elif defined(__VMS) > - return posix_1str(args, "et:chdir", (int (*)(const char *))chdir, > - NULL, NULL); > + return posix_1str(args, "et:chdir", (int (*)(const char *))chdir); > #else > - return posix_1str(args, "et:chdir", chdir, NULL, NULL); > + return posix_1str(args, "et:chdir", chdir); > #endif > } > > @@ -1485,7 +1520,7 @@ > static PyObject * > posix_chroot(PyObject *self, PyObject *args) > { > - return posix_1str(args, "et:chroot", chroot, NULL, NULL); > + return posix_1str(args, "et:chroot", chroot); > } > #endif > > @@ -2071,7 +2106,6 @@ > } > #endif /* HAVE_NICE */ > > - > PyDoc_STRVAR(posix_rename__doc__, > "rename(old, new)\n\n\ > Rename a file or directory."); > @@ -2080,7 +2114,36 @@ > posix_rename(PyObject *self, PyObject *args) > { > #ifdef MS_WINDOWS > - return posix_2str(args, "etet:rename", rename, "OO:rename", _wrename); > + PyObject *o1, *o2; > + char *p1, *p2; > + BOOL result; > + if (unicode_file_names()) { > + if (!PyArg_ParseTuple(args, "O&O&:rename", > + convert_to_unicode, &o1, > + convert_to_unicode, &o2)) > + PyErr_Clear(); > + else { > + Py_BEGIN_ALLOW_THREADS > + result = MoveFileW(PyUnicode_AsUnicode(o1), > + PyUnicode_AsUnicode(o2)); > + Py_END_ALLOW_THREADS > + Py_DECREF(o1); > + Py_DECREF(o2); > + if (!result) > + return win32_error("rename", NULL); > + Py_INCREF(Py_None); > + return Py_None; > + } > + } > + if (!PyArg_ParseTuple(args, "ss:rename", &p1, &p2)) > + return NULL; > + Py_BEGIN_ALLOW_THREADS > + result = MoveFileA(p1, p2); > + Py_END_ALLOW_THREADS > + if (!result) > + return win32_error("rename", NULL); > + Py_INCREF(Py_None); > + return Py_None; > #else > return posix_2str(args, "etet:rename", rename, NULL, NULL); > #endif > @@ -2095,9 +2158,9 @@ > posix_rmdir(PyObject *self, PyObject *args) > { > #ifdef MS_WINDOWS > - return posix_1str(args, "et:rmdir", rmdir, "U:rmdir", _wrmdir); > + return win32_1str(args, "rmdir", "s:rmdir", RemoveDirectoryA, "U:rmdir", RemoveDirectoryW); > #else > - return posix_1str(args, "et:rmdir", rmdir, NULL, NULL); > + return posix_1str(args, "et:rmdir", rmdir); > #endif > } > > @@ -2166,9 +2229,9 @@ > posix_unlink(PyObject *self, PyObject *args) > { > #ifdef MS_WINDOWS > - return posix_1str(args, "et:remove", unlink, "U:remove", _wunlink); > + return win32_1str(args, "remove", "s:remove", DeleteFileA, "U:remove", DeleteFileW); > #else > - return posix_1str(args, "et:remove", unlink, NULL, NULL); > + return posix_1str(args, "et:remove", unlink); > #endif > } > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > -- --Guido van Rossum (home page: http://www.python.org/~guido/) From python-checkins at python.org Thu May 4 19:08:03 2006 From: python-checkins at python.org (richard.tew) Date: Thu, 4 May 2006 19:08:03 +0200 (CEST) Subject: [Python-checkins] r45902 - stackless/Python-2.4.3/dev/Stackless/module/taskletobject.c Message-ID: <20060504170803.E5B531E4002@bag.python.org> Author: richard.tew Date: Thu May 4 19:08:03 2006 New Revision: 45902 Modified: stackless/Python-2.4.3/dev/Stackless/module/taskletobject.c Log: There is a unpickling race condition. While it is rare, sometimes tasklets get their setstate call after the channel they are blocked on. If this happens and we do not account for it, they will be left in a broken state where they are on the channels chain, but have cleared their blocked flag. We will assume that the presence of a chain, can only mean that the chain is that of a channel, rather than that of the main tasklet/scheduler. And therefore they can leave their blocked flag in place because the channel would have set it. Modified: stackless/Python-2.4.3/dev/Stackless/module/taskletobject.c ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/module/taskletobject.c (original) +++ stackless/Python-2.4.3/dev/Stackless/module/taskletobject.c Thu May 4 19:08:03 2006 @@ -315,9 +315,28 @@ nframes = PyList_GET_SIZE(lis); TASKLET_SETVAL(t, tempval); + + /* There is a unpickling race condition. While it is rare, + * sometimes tasklets get their setstate call after the + * channel they are blocked on. If this happens and we + * do not account for it, they will be left in a broken + * state where they are on the channels chain, but have + * cleared their blocked flag. + * + * We will assume that the presence of a chain, can only + * mean that the chain is that of a channel, rather than + * that of the main tasklet/scheduler. And therefore + * they can leave their blocked flag in place because the + * channel would have set it. + */ + i = t->flags.blocked; *(int *)&t->flags = flags; - /* we cannot restore blocked, must be done by a channel */ - t->flags.blocked = 0; + if (t->next == NULL) { + t->flags.blocked = 0; + } else { + t->flags.blocked = i; + } + /* t->nesting_level = nesting_level; XXX how do we handle this? XXX to be done: pickle the cstate without a ref to the task. From martin at v.loewis.de Thu May 4 19:47:54 2006 From: martin at v.loewis.de (=?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?=) Date: Thu, 04 May 2006 19:47:54 +0200 Subject: [Python-checkins] r45898 - in python/trunk: Lib/test/test_os.py Lib/test/test_shutil.py Misc/NEWS Modules/posixmodule.c In-Reply-To: References: <20060504100844.5C1691E4007@bag.python.org> Message-ID: <445A3E4A.8060402@v.loewis.de> Guido van Rossum wrote: > I wonder if it's time to move the Win32 code out of posixmodule.c? It > seems the current mess of #ifdefs can't be very maintainable. I vaguely recall that we had considered that before, and rejected it, for some reason. Not sure what the reason was, but one might have been that there still is OS/2 code in there, also. Regards, Martin From guido at python.org Thu May 4 20:08:40 2006 From: guido at python.org (Guido van Rossum) Date: Thu, 4 May 2006 11:08:40 -0700 Subject: [Python-checkins] r45898 - in python/trunk: Lib/test/test_os.py Lib/test/test_shutil.py Misc/NEWS Modules/posixmodule.c In-Reply-To: <445A3E4A.8060402@v.loewis.de> References: <20060504100844.5C1691E4007@bag.python.org> <445A3E4A.8060402@v.loewis.de> Message-ID: Maybe it's time to look again? Perhaps a refactoring could be used so that there are multiple files -- code shared across all OS'es, and code specifically to one OS. On 5/4/06, "Martin v. L?wis" wrote: > Guido van Rossum wrote: > > I wonder if it's time to move the Win32 code out of posixmodule.c? It > > seems the current mess of #ifdefs can't be very maintainable. > > I vaguely recall that we had considered that before, and rejected it, > for some reason. Not sure what the reason was, but one might have been > that there still is OS/2 code in there, also. > > Regards, > Martin > -- --Guido van Rossum (home page: http://www.python.org/~guido/) From python-checkins at python.org Thu May 4 20:15:11 2006 From: python-checkins at python.org (guido.van.rossum) Date: Thu, 4 May 2006 20:15:11 +0200 (CEST) Subject: [Python-checkins] r45903 - peps/trunk/pep-3100.txt Message-ID: <20060504181511.796DF1E401F@bag.python.org> Author: guido.van.rossum Date: Thu May 4 20:15:10 2006 New Revision: 45903 Modified: peps/trunk/pep-3100.txt Log: Third time trying to commit the new pronouncement about set literals. :-( Also mention removing __mod__ and __divmod__ from float. Modified: peps/trunk/pep-3100.txt ============================================================================== --- peps/trunk/pep-3100.txt (original) +++ peps/trunk/pep-3100.txt Thu May 4 20:15:10 2006 @@ -104,12 +104,12 @@ and semantics is evil. * Attributes on functions of the form ``func_whatever`` will be renamed ``__whatever__`` [25]_ -* Set literals and comprehensions [27]_ - {/} means set(); {x} means set([x]); {x, y} means set([x, y]). +* Set literals and comprehensions [27]_ [28]_ + {x} means set([x]); {x, y} means set([x, y]). {F(x) for x in S if P(x)} means set(F(x) for x in S if P(x)). NB. {range(x)} means set([range(x)]), NOT set(range(x)). + There's no literal for an empty set; use set() (or {1}&{2} :-). There's no frozenset literal; they are too rarely needed. - The {/} part is still controversial. To be removed: @@ -117,6 +117,7 @@ * ``raise Exception, "message"``: use ``raise Exception("message")`` [14]_ * ```x```: use ``repr(x)`` [2]_ * The ``<>`` operator: use ``!=`` instead [3]_ +* The __mod__ and __divmod__ special methods on float. [29]_ * Unbound methods [7]_ * METH_OLDARGS, WITH_CYCLE_GC * __getslice__, __setslice__, __delslice__ [17]_ @@ -317,6 +318,12 @@ .. [27] python-3000 email ("sets in P3K?") http://mail.python.org/pipermail/python-3000/2006-April/001286.html + [28] python-3000 email ("sets in P3K?") + http://mail.python.org/pipermail/python-3000/2006-May/001666.html + + [29] python-3000 email ("bug in modulus?") + http://mail.python.org/pipermail/python-3000/2006-May/001735.html + .. [#pep238] PEP 238 (Changing the Division Operator) http://www.python.org/dev/peps/pep-0238 From python-checkins at python.org Thu May 4 20:31:11 2006 From: python-checkins at python.org (richard.tew) Date: Thu, 4 May 2006 20:31:11 +0200 (CEST) Subject: [Python-checkins] r45904 - stackless/binaries-pc/python24.zip stackless/binaries-pc/python24.zip.md5.py Message-ID: <20060504183111.157E61E4002@bag.python.org> Author: richard.tew Date: Thu May 4 20:27:22 2006 New Revision: 45904 Added: stackless/binaries-pc/python24.zip (contents, props changed) stackless/binaries-pc/python24.zip.md5.py Log: Zip archive based install of Python 2.4.3, includes all the bits and pieces needed to just extract over your Python installation directory. e.g. I extracted it into my Python 2.4.3 installation in 'C:\Program Files\Python243'. Added: stackless/binaries-pc/python24.zip ============================================================================== Binary file. No diff available. Added: stackless/binaries-pc/python24.zip.md5.py ============================================================================== --- (empty file) +++ stackless/binaries-pc/python24.zip.md5.py Thu May 4 20:27:22 2006 @@ -0,0 +1,8 @@ + +import md5 +expected = "a25a5cc5bd1bec37dda1a542e9a52cec" +fname = r"python24.zip" +print "expected digest", expected +received = md5.md5(file(fname, "rb").read()).hexdigest() +print ("matched", "NOT MATCHED!!") [received != expected] +raw_input("press enter to continue") From nnorwitz at gmail.com Fri May 5 06:16:14 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Thu, 4 May 2006 21:16:14 -0700 Subject: [Python-checkins] r45900 - python/trunk/Lib/mailbox.py In-Reply-To: <20060504142752.9D7CC1E4002@bag.python.org> References: <20060504142752.9D7CC1E4002@bag.python.org> Message-ID: Two questions, 1) shouldn't the class be: class WindowsError(Exception): pass Does the ernno module exist on Windows and if so, do 2 and 183 exist in it? If not it might be easier to make your own local ENOTFOUND or whatever, then you wouldn't need comments. n -- On 5/4/06, martin.v.loewis wrote: > Author: martin.v.loewis > Date: Thu May 4 16:27:52 2006 > New Revision: 45900 > > Modified: > python/trunk/Lib/mailbox.py > Log: > Update checks to consider Windows error numbers. > > Modified: python/trunk/Lib/mailbox.py > ============================================================================== > --- python/trunk/Lib/mailbox.py (original) > +++ python/trunk/Lib/mailbox.py Thu May 4 16:27:52 2006 > @@ -2,6 +2,7 @@ > > """Read/write support for Maildir, mbox, MH, Babyl, and MMDF mailboxes.""" > > +import sys > import os > import time > import calendar > @@ -23,6 +24,11 @@ > 'BabylMessage', 'MMDFMessage', 'UnixMailbox', > 'PortableUnixMailbox', 'MmdfMailbox', 'MHMailbox', 'BabylMailbox' ] > > +if sys.platform != 'win32': > + # Define WindowsError so that we can use it in an except statement > + # even on non-Windows systems > + class WindowsError: > + pass > > class Mailbox: > """A group of messages in a particular place.""" > @@ -262,10 +268,11 @@ > self.remove(key) > except KeyError: > pass > + except WindowsError, e: > + if e.errno != 2: # ERROR_FILE_NOT_FOUND > + raise > except OSError, e: > - if e.errno == errno.ENOENT: > - pass > - else: > + if e.errno != errno.ENOENT: > raise > > def __setitem__(self, key, message): > @@ -419,6 +426,12 @@ > path = os.path.join(self._path, 'tmp', uniq) > try: > os.stat(path) > + except WindowsError, e: > + if e.errno == 2: # ERROR_FILE_NOT_FOUND > + Maildir._count += 1 > + return open(path, 'wb+') > + else: > + raise > except OSError, e: > if e.errno == errno.ENOENT: > Maildir._count += 1 > @@ -566,6 +579,12 @@ > self._file.close() > try: > os.rename(new_file.name, self._path) > + except WindowsError, e: > + if e.errno == 183: # ERROR_ALREADY_EXISTS > + os.remove(self._path) > + os.rename(new_file.name, self._path) > + else: > + raise > except OSError, e: > if e.errno == errno.EEXIST: > os.remove(self._path) > @@ -1837,6 +1856,13 @@ > else: > os.rename(pre_lock.name, f.name + '.lock') > dotlock_done = True > + except WindowsError, e: > + if e.errno == 183: # ERROR_ALREADY_EXISTS > + os.remove(pre_lock.name) > + raise ExternalClashError('dot lock unavailable: %s' % > + f.name) > + else: > + raise > except OSError, e: > if e.errno == errno.EEXIST: > os.remove(pre_lock.name) > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From nnorwitz at gmail.com Fri May 5 06:17:43 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Thu, 4 May 2006 21:17:43 -0700 Subject: [Python-checkins] r45824 - python/trunk/Lib/inspect.py In-Reply-To: <20060430174227.455D91E400D@bag.python.org> References: <20060430174227.455D91E400D@bag.python.org> Message-ID: Can we get a test case for this? -- n On 4/30/06, georg.brandl wrote: > Author: georg.brandl > Date: Sun Apr 30 19:42:26 2006 > New Revision: 45824 > > Modified: > python/trunk/Lib/inspect.py > Log: > Fix another problem in inspect: if the module for an object cannot be found, don't try to give its __dict__ to linecache. > > > > Modified: python/trunk/Lib/inspect.py > ============================================================================== > --- python/trunk/Lib/inspect.py (original) > +++ python/trunk/Lib/inspect.py Sun Apr 30 19:42:26 2006 > @@ -412,7 +412,11 @@ > in the file and the line number indexes a line in that list. An IOError > is raised if the source code cannot be retrieved.""" > file = getsourcefile(object) or getfile(object) > - lines = linecache.getlines(file, getmodule(object).__dict__) > + module = getmodule(object) > + if module: > + lines = linecache.getlines(file, module.__dict__) > + else: > + lines = linecache.getlines(file) > if not lines: > raise IOError('could not get source code') > > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From nnorwitz at gmail.com Fri May 5 06:17:56 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Thu, 4 May 2006 21:17:56 -0700 Subject: [Python-checkins] r45895 - python/trunk/Lib/imputil.py In-Reply-To: <20060504050812.03A751E4006@bag.python.org> References: <20060504050812.03A751E4006@bag.python.org> Message-ID: Can we get a test case for this? -- n On 5/3/06, georg.brandl wrote: > Author: georg.brandl > Date: Thu May 4 07:08:10 2006 > New Revision: 45895 > > Modified: > python/trunk/Lib/imputil.py > Log: > Bug #1481530: allow "from os.path import ..." with imputil > > > Modified: python/trunk/Lib/imputil.py > ============================================================================== > --- python/trunk/Lib/imputil.py (original) > +++ python/trunk/Lib/imputil.py Thu May 4 07:08:10 2006 > @@ -131,9 +131,12 @@ > if importer: > return importer._finish_import(top_module, parts[1:], fromlist) > > - # Grrr, some people "import os.path" > + # Grrr, some people "import os.path" or do "from os.path import ..." > if len(parts) == 2 and hasattr(top_module, parts[1]): > - return top_module > + if fromlist: > + return getattr(top_module, parts[1]) > + else: > + return top_module > > # If the importer does not exist, then we have to bail. A missing > # importer means that something else imported the module, and we have > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From nnorwitz at gmail.com Fri May 5 06:18:49 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Thu, 4 May 2006 21:18:49 -0700 Subject: [Python-checkins] r45822 - python/trunk/Lib/inspect.py In-Reply-To: <20060430155926.ADE981E400D@bag.python.org> References: <20060430155926.ADE981E400D@bag.python.org> Message-ID: Can we get a test case for this? Docs should probably be updated with the limitation too. -- n On 4/30/06, phillip.eby wrote: > Author: phillip.eby > Date: Sun Apr 30 17:59:26 2006 > New Revision: 45822 > > Modified: > python/trunk/Lib/inspect.py > Log: > Fix infinite regress when inspecting or frames. > > > Modified: python/trunk/Lib/inspect.py > ============================================================================== > --- python/trunk/Lib/inspect.py (original) > +++ python/trunk/Lib/inspect.py Sun Apr 30 17:59:26 2006 > @@ -353,7 +353,13 @@ > if 'b' in mode and string.lower(filename[-len(suffix):]) == suffix: > # Looks like a binary file. We want to only return a text file. > return None > - if os.path.exists(filename) or hasattr(getmodule(object), '__loader__'): > + if os.path.exists(filename): > + return filename > + # Ugly but necessary - '' and '' mean that getmodule() > + # would infinitely recurse, because they're not real files nor loadable > + # Note that this means that writing a PEP 302 loader that uses '<' > + # at the start of a filename is now not a good idea. :( > + if filename[:1]!='<' and hasattr(getmodule(object), '__loader__'): > return filename > > def getabsfile(object): > _______________________________________________ > Python-checkins mailing list > Python-checkins at python.org > http://mail.python.org/mailman/listinfo/python-checkins > From g.brandl at gmx.net Fri May 5 06:46:19 2006 From: g.brandl at gmx.net (Georg Brandl) Date: Fri, 05 May 2006 06:46:19 +0200 Subject: [Python-checkins] r45895 - python/trunk/Lib/imputil.py In-Reply-To: References: <20060504050812.03A751E4006@bag.python.org> Message-ID: Neal Norwitz wrote: > Can we get a test case for this? -- n > > On 5/3/06, georg.brandl wrote: >> Author: georg.brandl >> Date: Thu May 4 07:08:10 2006 >> New Revision: 45895 >> >> Modified: >> python/trunk/Lib/imputil.py >> Log: >> Bug #1481530: allow "from os.path import ..." with imputil As there is no test suite for imputil at all, I don't think so... Georg From python-checkins at python.org Fri May 5 06:49:34 2006 From: python-checkins at python.org (guido.van.rossum) Date: Fri, 5 May 2006 06:49:34 +0200 (CEST) Subject: [Python-checkins] r45906 - sandbox/trunk/sio/bench_cat.py sandbox/trunk/sio/bench_io.py Message-ID: <20060505044934.4468B1E4007@bag.python.org> Author: guido.van.rossum Date: Fri May 5 06:49:34 2006 New Revision: 45906 Added: sandbox/trunk/sio/bench_cat.py (contents, props changed) sandbox/trunk/sio/bench_io.py (contents, props changed) Log: Add some simple benchmarks. Added: sandbox/trunk/sio/bench_cat.py ============================================================================== --- (empty file) +++ sandbox/trunk/sio/bench_cat.py Fri May 5 06:49:34 2006 @@ -0,0 +1,20 @@ +import timeit + +for size in [10, 20, 50, 100, 200, 500, 1000]: + print "------ size = %d ------" % size + strings = [] + byteses = [] + for i in range(100000): + n = size + s = "x"*n + b = bytes(s) + strings.append(s) + byteses.append(b) + + timer = timeit.Timer("bbb = bytes()\nfor b in byteses: bbb += b", + "from __main__ import strings, byteses") + print "byteses %.3f" % min(timer.repeat(3, 10)) + + timer = timeit.Timer("sss = ''.join(strings)", + "from __main__ import strings, byteses") + print "strings %.3f" % min(timer.repeat(3, 10)) Added: sandbox/trunk/sio/bench_io.py ============================================================================== --- (empty file) +++ sandbox/trunk/sio/bench_io.py Fri May 5 06:49:34 2006 @@ -0,0 +1,74 @@ +"""A silly I/O benchmark.""" + +import io +import os +import time + +TFN = "@bench" # Test filename +N = 64*1024*1024 # Number of bytes to read/write + +def writer(): + buffer = bytes("X")*(8*1024) + bufsize = len(buffer) + file = io.open(TFN, "wb", bufsize=0) + try: + size = 0 + while size < N: + file.write(buffer) + size += bufsize + finally: + file.close() + assert os.path.getsize(TFN) == N + +def oldwriter(): + buffer = "X"*(8*1024) + bufsize = len(buffer) + file = open(TFN, "wb", bufsize) + try: + size = 0 + while size < N: + file.write(buffer) + size += bufsize + finally: + file.close() + assert os.path.getsize(TFN) == N + +def reader(): + buffer = bytes() + bufsize = 32*1024 + file = io.open(TFN, "rb", 32*1024) + try: + while len(buffer) < N: + buffer += file.read(bufsize) + finally: + file.close() + assert len(buffer) == os.path.getsize(TFN) == N + +def oldreader(): + bufsize = 32*1024 + f = open(TFN, "rb", 8*1024) + try: + buffer = "" + while len(buffer) < N: + buffer += f.read(bufsize) + finally: + f.close() + assert len(buffer) == os.path.getsize(TFN) == N + +def timeit(func): + t0, c0 = time.time(), time.clock() + func() + t1, c1 = time.time(), time.clock() + print "%s: %6.3f time, %6.3f clock" % (func.__name__, t1-t0, c1-c0) + +def main(): + for i in range(1): + timeit(writer) + timeit(reader) + os.remove(TFN) + timeit(oldwriter) + timeit(oldreader) + os.remove(TFN) + +if __name__ == "__main__": + main() From nnorwitz at gmail.com Fri May 5 06:49:59 2006 From: nnorwitz at gmail.com (Neal Norwitz) Date: Thu, 4 May 2006 21:49:59 -0700 Subject: [Python-checkins] r45895 - python/trunk/Lib/imputil.py In-Reply-To: References: <20060504050812.03A751E4006@bag.python.org> Message-ID: On 5/4/06, Georg Brandl wrote: > Neal Norwitz wrote: > > Can we get a test case for this? -- n > > > > On 5/3/06, georg.brandl wrote: > > >> Bug #1481530: allow "from os.path import ..." with imputil > > As there is no test suite for imputil at all, I don't think so... You could start one even if it only tests this small change. It builds character and will put hair on your chest. :-) n From g.brandl at gmx.net Fri May 5 06:47:33 2006 From: g.brandl at gmx.net (Georg Brandl) Date: Fri, 05 May 2006 06:47:33 +0200 Subject: [Python-checkins] r45824 - python/trunk/Lib/inspect.py In-Reply-To: References: <20060430174227.455D91E400D@bag.python.org> Message-ID: Neal Norwitz wrote: > Can we get a test case for this? -- n > > On 4/30/06, georg.brandl wrote: >> Author: georg.brandl >> Date: Sun Apr 30 19:42:26 2006 >> New Revision: 45824 >> >> Modified: >> python/trunk/Lib/inspect.py >> Log: >> Fix another problem in inspect: if the module for an object cannot be found, don't try to give its __dict__ to linecache. A test case for the other problem fixed by PJE would cover this as well, I think. Georg From martin at v.loewis.de Fri May 5 07:18:32 2006 From: martin at v.loewis.de (=?ISO-8859-1?Q?=22Martin_v=2E_L=F6wis=22?=) Date: Fri, 05 May 2006 07:18:32 +0200 Subject: [Python-checkins] r45900 - python/trunk/Lib/mailbox.py In-Reply-To: References: <20060504142752.9D7CC1E4002@bag.python.org> Message-ID: <445AE028.6000605@v.loewis.de> Neal Norwitz wrote: > Two questions, 1) shouldn't the class be: > > class WindowsError(Exception): pass For correctness, no: actual exceptions will never be of that class, so the except clause will never match. While Python will enforce some day that the exceptions raised inherit from exception, it won't enforce that the exceptions caught inherit from exception - it only requires that the names are bound. So in principle, WindowsError = None would have worked as well. For clarity, it is certainly better to inherit from exception > Does the ernno module exist on Windows and if so, do 2 and 183 exist in it? It exists, but it (currently) doesn't define symbolic values for the winerror.h constants. Perhaps it should. > If not it might be easier to make your own local ENOTFOUND or whatever, > then you wouldn't need comments. I hesitate to define global things in a module if I don't mean them to be imported (so I feel guilt about defining WindowsError as well). Of course, _ERROR_FILE_NOT_FOUND would be harmless. Regards, Martin From python-checkins at python.org Fri May 5 09:27:46 2006 From: python-checkins at python.org (richard.tew) Date: Fri, 5 May 2006 09:27:46 +0200 (CEST) Subject: [Python-checkins] r45907 - stackless/Python-2.4.3/dev/Stackless/stackless_version.h Message-ID: <20060505072746.6AC6B1E401A@bag.python.org> Author: richard.tew Date: Fri May 5 09:27:45 2006 New Revision: 45907 Modified: stackless/Python-2.4.3/dev/Stackless/stackless_version.h Log: Updated Stackless version. Modified: stackless/Python-2.4.3/dev/Stackless/stackless_version.h ============================================================================== --- stackless/Python-2.4.3/dev/Stackless/stackless_version.h (original) +++ stackless/Python-2.4.3/dev/Stackless/stackless_version.h Fri May 5 09:27:45 2006 @@ -1,7 +1,7 @@ /* * Stackless Python version string - * created at Thu Sep 29 03:37:53 2005 by mkversion.py + * created at Thu May 04 18:28:57 2006 by mkversion.py */ /* keep this entry up-to-date */ -#define STACKLESS_VERSION "3.1b3 050929" +#define STACKLESS_VERSION "3.1b3 060504" From python-checkins at python.org Fri May 5 11:14:12 2006 From: python-checkins at python.org (richard.tew) Date: Fri, 5 May 2006 11:14:12 +0200 (CEST) Subject: [Python-checkins] r45908 - stackless/Python-2.4.3/dev/PCbuild/publish_binaries.py Message-ID: <20060505091412.6BC4C1E4007@bag.python.org> Author: richard.tew Date: Fri May 5 11:14:11 2006 New Revision: 45908 Modified: stackless/Python-2.4.3/dev/PCbuild/publish_binaries.py Log: Updated build publishing script. No longer packages the dynamic and static libraries in separate release and debug archives. Instead it packages them in one archive with the scripts that have custom Stackless modifications, in a directory structure that can be extracted over the top of an existing PYthon installation. Modified: stackless/Python-2.4.3/dev/PCbuild/publish_binaries.py ============================================================================== --- stackless/Python-2.4.3/dev/PCbuild/publish_binaries.py (original) +++ stackless/Python-2.4.3/dev/PCbuild/publish_binaries.py Fri May 5 11:14:11 2006 @@ -1,7 +1,7 @@ from zipfile import * import os, sys, md5 -exp_path = r"..\..\..\binaries-pc" +exp_path = r"..\..\binaries-pc" prog = """ import md5 @@ -13,25 +13,36 @@ raw_input("press enter to continue") """ -filenames = "python24 stackless _tkinter".split() -# no longer needed -filenames = "python24".split() +fileList = [ r"..\Lib\copy_reg.py", r"..\Lib\pickle.py" ] for debug in ("", "_d"): - zname = os.path.join(exp_path, "python24%s.dll.zip" % debug) - z = ZipFile(zname, "w", ZIP_DEFLATED) - for name in filenames: - name += debug - for ext in ".dll .exp .lib .pyd".split(): - export = name + ext - if os.path.exists(export): - z.write(export) - z.close() - expected = md5.md5(file(zname, "rb").read()).hexdigest() - signame = zname+".md5.py" - shortname = os.path.split(zname)[-1] - file(signame, "w").write(prog % (expected, shortname)) + for suffix in ("dll", "lib", "exp"): + fileList.append("python24%s.%s" % (debug, suffix)) + +pathBySuffix = { + "dll": "", + "lib": "libs/", + "exp": "libs/", + "py": "Lib/", +} + + +zname = os.path.join(exp_path, "python24.zip") +z = ZipFile(zname, "w", ZIP_DEFLATED) +for fileName in fileList: + if os.path.exists(fileName): + suffix = fileName[fileName.rfind(".")+1:] + s = open(fileName, "rb").read() + z.writestr(pathBySuffix[suffix] + os.path.basename(fileName), s) + else: + print "File not found:", fileName +z.close() + +signame = zname+".md5.py" +expected = md5.md5(file(zname, "rb").read()).hexdigest() +shortname = os.path.split(zname)[-1] +file(signame, "w").write(prog % (expected, shortname)) # generate a reST include for upload time. -import time -txt = ".. |uploaded| replace:: " + time.ctime() -print >> file(os.path.join(exp_path, "uploaded.txt"), "w"), txt +#import time +#txt = ".. |uploaded| replace:: " + time.ctime() +#print >> file(os.path.join(exp_path, "uploaded.txt"), "w"), txt From python-checkins at python.org Fri May 5 12:52:44 2006 From: python-checkins at python.org (thomas.wouters) Date: Fri, 5 May 2006 12:52:44 +0200 (CEST) Subject: [Python-checkins] r45909 - in python/branches/release24-maint: Lib/test/test_pty.py Misc/ACKS Modules/fcntlmodule.c Message-ID: <20060505105244.9250A1E4008@bag.python.org> Author: thomas.wouters Date: Fri May 5 12:52:43 2006 New Revision: 45909 Modified: python/branches/release24-maint/Lib/test/test_pty.py python/branches/release24-maint/Misc/ACKS python/branches/release24-maint/Modules/fcntlmodule.c Log: Backport SF bug/patch #1433877: string parameter to ioctl not null terminated The new char-array used in ioctl calls wasn't explicitly NUL-terminated; quite probably the cause for the test_pty failures on Solaris that we circumvented earlier. Modified: python/branches/release24-maint/Lib/test/test_pty.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_pty.py (original) +++ python/branches/release24-maint/Lib/test/test_pty.py Fri May 5 12:52:43 2006 @@ -4,13 +4,6 @@ TEST_STRING_1 = "I wish to buy a fish license.\n" TEST_STRING_2 = "For my pet fish, Eric.\n" -# Solaris (at least 2.9 and 2.10) seem to have a fickle isatty(). The first -# test below, testing the result of os.openpty() for tty-ness, sometimes -# (but not always) fails. The second isatty test, in the sub-process, always -# works. Allow that fickle first test to fail on these platforms, since it -# doesn't actually affect functionality. -fickle_isatty = ["sunos5"] - if verbose: def debug(msg): print msg @@ -54,7 +47,7 @@ # " An optional feature could not be imported " ... ? raise TestSkipped, "Pseudo-terminals (seemingly) not functional." - if not os.isatty(slave_fd) and sys.platform not in fickle_isatty: + if not os.isatty(slave_fd): raise TestFailed, "slave_fd is not a tty" debug("Writing to slave_fd") Modified: python/branches/release24-maint/Misc/ACKS ============================================================================== --- python/branches/release24-maint/Misc/ACKS (original) +++ python/branches/release24-maint/Misc/ACKS Fri May 5 12:52:43 2006 @@ -33,6 +33,7 @@ Luigi Ballabio Michael J. Barber Chris Barker +Quentin Barnes Cesar Eduardo Barros Des Barry Ulf Bartelt Modified: python/branches/release24-maint/Modules/fcntlmodule.c ============================================================================== --- python/branches/release24-maint/Modules/fcntlmodule.c (original) +++ python/branches/release24-maint/Modules/fcntlmodule.c Fri May 5 12:52:43 2006 @@ -93,6 +93,7 @@ static PyObject * fcntl_ioctl(PyObject *self, PyObject *args) { +#define IOCTL_BUFSZ 1024 int fd; int code; int arg; @@ -100,7 +101,7 @@ char *str; int len; int mutate_arg = 0; - char buf[1024]; + char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ if (PyArg_ParseTuple(args, "O&iw#|i:ioctl", conv_descriptor, &fd, &code, @@ -118,8 +119,9 @@ mutate_arg = 0; } if (mutate_arg) { - if (len <= sizeof buf) { + if (len <= IOCTL_BUFSZ) { memcpy(buf, str, len); + buf[len] = '\0'; arg = buf; } else { @@ -127,13 +129,14 @@ } } else { - if (len > sizeof buf) { + if (len > IOCTL_BUFSZ) { PyErr_SetString(PyExc_ValueError, "ioctl string arg too long"); return NULL; } else { memcpy(buf, str, len); + buf[len] = '\0'; arg = buf; } } @@ -145,7 +148,7 @@ else { ret = ioctl(fd, code, arg); } - if (mutate_arg && (len < sizeof buf)) { + if (mutate_arg && (len < IOCTL_BUFSZ)) { memcpy(str, buf, len); } if (ret < 0) { @@ -163,12 +166,13 @@ PyErr_Clear(); if (PyArg_ParseTuple(args, "O&is#:ioctl", conv_descriptor, &fd, &code, &str, &len)) { - if (len > sizeof buf) { + if (len > IOCTL_BUFSZ) { PyErr_SetString(PyExc_ValueError, "ioctl string arg too long"); return NULL; } memcpy(buf, str, len); + buf[len] = '\0'; Py_BEGIN_ALLOW_THREADS ret = ioctl(fd, code, buf); Py_END_ALLOW_THREADS @@ -199,6 +203,7 @@ return NULL; } return PyInt_FromLong((long)ret); +#undef IOCTL_BUFSZ } PyDoc_STRVAR(ioctl_doc, From buildbot at python.org Fri May 5 13:27:02 2006 From: buildbot at python.org (buildbot at python.org) Date: Fri, 05 May 2006 11:27:02 +0000 Subject: [Python-checkins] buildbot warnings in sparc solaris10 gcc 2.4 Message-ID: <20060505112702.4546B1E4008@bag.python.org> The Buildbot has detected a new failure of sparc solaris10 gcc 2.4. Full details are available at: http://www.python.org/dev/buildbot/all/sparc%2520solaris10%2520gcc%25202.4/builds/119 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: thomas.wouters Build Had Warnings: warnings test sincerely, -The Buildbot From buildbot at python.org Fri May 5 14:26:51 2006 From: buildbot at python.org (buildbot at python.org) Date: Fri, 05 May 2006 12:26:51 +0000 Subject: [Python-checkins] buildbot warnings in alpha Debian 2.4 Message-ID: <20060505122651.D9DEB1E400A@bag.python.org> 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/16 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release24-maint] HEAD Blamelist: thomas.wouters Build Had Warnings: warnings test sincerely, -The Buildbot From python-checkins at python.org Fri May 5 19:50:06 2006 From: python-checkins at python.org (richard.tew) Date: Fri, 5 May 2006 19:50:06 +0200 (CEST) Subject: [Python-checkins] r45911 - stackless/Python-2.4.3/dev/Modules/Setup.config.in stackless/Python-2.4.3/dev/Modules/Setup.dist stackless/Python-2.4.3/dev/Modules/config.c.in stackless/Python-2.4.3/dev/Modules/makesetup Message-ID: <20060505175006.A7D761E400A@bag.python.org> Author: richard.tew Date: Fri May 5 19:50:05 2006 New Revision: 45911 Modified: stackless/Python-2.4.3/dev/Modules/Setup.config.in (contents, props changed) stackless/Python-2.4.3/dev/Modules/Setup.dist (contents, props changed) stackless/Python-2.4.3/dev/Modules/config.c.in (contents, props changed) stackless/Python-2.4.3/dev/Modules/makesetup (contents, props changed) Log: Fixed up the mime types (text/plain) and eol styles (native) so that compilation will work on unix os'. Modified: stackless/Python-2.4.3/dev/Modules/Setup.config.in ============================================================================== Binary files. No diff available. Modified: stackless/Python-2.4.3/dev/Modules/Setup.dist ============================================================================== --- stackless/Python-2.4.3/dev/Modules/Setup.dist (original) +++ stackless/Python-2.4.3/dev/Modules/Setup.dist Fri May 5 19:50:05 2006 @@ -1,488 +1,488 @@ -# -*- makefile -*- -# The file Setup is used by the makesetup script to construct the files -# Makefile and config.c, from Makefile.pre and config.c.in, -# respectively. The file Setup itself is initially copied from -# Setup.dist; once it exists it will not be overwritten, so you can edit -# Setup to your heart's content. Note that Makefile.pre is created -# from Makefile.pre.in by the toplevel configure script. - -# (VPATH notes: Setup and Makefile.pre are in the build directory, as -# are Makefile and config.c; the *.in and *.dist files are in the source -# directory.) - -# Each line in this file describes one or more optional modules. -# Modules enabled here will not be compiled by the setup.py script, -# so the file can be used to override setup.py's behavior. - -# Lines have the following structure: -# -# ... [ ...] [ ...] [ ...] -# -# is anything ending in .c (.C, .cc, .c++ are C++ files) -# is anything starting with -I, -D, -U or -C -# is anything ending in .a or beginning with -l or -L -# is anything else but should be a valid Python -# identifier (letters, digits, underscores, beginning with non-digit) -# -# (As the makesetup script changes, it may recognize some other -# arguments as well, e.g. *.so and *.sl as libraries. See the big -# case statement in the makesetup script.) -# -# Lines can also have the form -# -# = -# -# which defines a Make variable definition inserted into Makefile.in -# -# Finally, if a line contains just the word "*shared*" (without the -# quotes but with the stars), then the following modules will not be -# built statically. The build process works like this: -# -# 1. Build all modules that are declared as static in Modules/Setup, -# combine them into libpythonxy.a, combine that into python. -# 2. Build all modules that are listed as shared in Modules/Setup. -# 3. Invoke setup.py. That builds all modules that -# a) are not builtin, and -# b) are not listed in Modules/Setup, and -# c) can be build on the target -# -# Therefore, modules declared to be shared will not be -# included in the config.c file, nor in the list of objects to be -# added to the library archive, and their linker options won't be -# added to the linker options. Rules to create their .o files and -# their shared libraries will still be added to the Makefile, and -# their names will be collected in the Make variable SHAREDMODS. This -# is used to build modules as shared libraries. (They can be -# installed using "make sharedinstall", which is implied by the -# toplevel "make install" target.) (For compatibility, -# *noconfig* has the same effect as *shared*.) -# -# In addition, *static* explicitly declares the following modules to -# be static. Lines containing "*static*" and "*shared*" may thus -# alternate thoughout this file. - -# NOTE: As a standard policy, as many modules as can be supported by a -# platform should be present. The distribution comes with all modules -# enabled that are supported by most platforms and don't require you -# to ftp sources from elsewhere. - - -# Some special rules to define PYTHONPATH. -# Edit the definitions below to indicate which options you are using. -# Don't add any whitespace or comments! - -# Directories where library files get installed. -# DESTLIB is for Python modules; MACHDESTLIB for shared libraries. -DESTLIB=$(LIBDEST) -MACHDESTLIB=$(BINLIBDEST) - -# NOTE: all the paths are now relative to the prefix that is computed -# at run time! - -# Standard path -- don't edit. -# No leading colon since this is the first entry. -# Empty since this is now just the runtime prefix. -DESTPATH= - -# Site specific path components -- should begin with : if non-empty -SITEPATH= - -# Standard path components for test modules -TESTPATH= - -# Path components for machine- or system-dependent modules and shared libraries -MACHDEPPATH=:plat-$(MACHDEP) -EXTRAMACHDEPPATH= - -# Path component for the Tkinter-related modules -# The TKPATH variable is always enabled, to save you the effort. -TKPATH=:lib-tk - -COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH) -PYTHONPATH=$(COREPYTHONPATH) - - -# The modules listed here can't be built as shared libraries for -# various reasons; therefore they are listed here instead of in the -# normal order. - -# This only contains the minimal set of modules required to run the -# setup.py script in the root of the Python source tree. - -posix posixmodule.c # posix (UNIX) system calls -errno errnomodule.c # posix (UNIX) errno values -pwd pwdmodule.c # this is needed to find out the user's home dir - # if $HOME is not set -_sre _sre.c # Fredrik Lundh's new regular expressions -_codecs _codecsmodule.c # access to the builtin codecs and codec registry - -# The zipimport module is always imported at startup. Having it as a -# builtin module avoids some bootstrapping problems and reduces overhead. -zipimport zipimport.c - -# The rest of the modules listed in this file are all commented out by -# default. Usually they can be detected and built as dynamically -# loaded modules by the new setup.py script added in Python 2.1. If -# you're on a platform that doesn't support dynamic loading, want to -# compile modules statically into the Python binary, or need to -# specify some odd set of compiler switches, you can uncomment the -# appropriate lines below. - -# ====================================================================== - -# The Python symtable module depends on .h files that setup.py doesn't track -_symtable symtablemodule.c - -# The SGI specific GL module: - -GLHACK=-Dclear=__GLclear -#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 - -# Pure module. Cannot be linked dynamically. -# -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE -#WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE -#PURE_INCLS=-I/usr/local/include -#PURE_STUBLIBS=-L/usr/local/lib -lpurify_stubs -lquantify_stubs -#pure puremodule.c $(WHICH_PURE_PRODUCTS) $(PURE_INCLS) $(PURE_STUBLIBS) - -# Uncommenting the following line tells makesetup that all following -# modules are to be built as shared libraries (see above for more -# detail; also note that *static* reverses this effect): - -#*shared* - -# GNU readline. Unlike previous Python incarnations, GNU readline is -# now incorporated in an optional module, configured in the Setup file -# instead of by a configure script switch. You may have to insert a -# -L option pointing to the directory where libreadline.* lives, -# and you may have to change -ltermcap to -ltermlib or perhaps remove -# it, depending on your system -- see the GNU readline instructions. -# It's okay for this to be a shared library, too. - -#readline readline.c -lreadline -ltermcap - - -# Modules that should always be present (non UNIX dependent): - -#array arraymodule.c # array objects -#cmath cmathmodule.c # -lm # complex math library functions -#math mathmodule.c # -lm # math library functions, e.g. sin() -#struct structmodule.c # binary structure packing/unpacking -#time timemodule.c # -lm # time operations and variables -#operator operator.c # operator.add() and similar goodies -#_weakref _weakref.c # basic weak reference support -#_testcapi _testcapimodule.c # Python C API test module -#_random _randommodule.c # Random number generator -#collections collectionsmodule.c # Container types -#itertools itertoolsmodule.c # Functions creating iterators for efficient looping -#strop stropmodule.c # String manipulations - -#unicodedata unicodedata.c # static Unicode character database - -# access to ISO C locale support -#_locale _localemodule.c # -lintl - - -# Modules with some UNIX dependencies -- on by default: -# (If you have a really backward UNIX, select and socket may not be -# supported...) - -#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) -#grp grpmodule.c # grp(3) -#select selectmodule.c # select(2); not on ancient System V - -# Memory-mapped files (also works on Win32). -#mmap mmapmodule.c - -# CSV file helper -#_csv _csv.c - -# Socket module helper for socket(2) -#_socket socketmodule.c - -# Socket module helper for SSL support; you must comment out the other -# socket line above, and possibly edit the SSL variable: -#SSL=/usr/local/ssl -#_ssl _ssl.c \ -# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ -# -L$(SSL)/lib -lssl -lcrypto - -# The crypt module is now disabled by default because it breaks builds -# on many systems (where -lcrypt is needed), e.g. Linux (I believe). -# -# First, look at Setup.config; configure may have set this for you. - -#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems - - -# Some more UNIX dependent modules -- off by default, since these -# are not supported by all UNIX systems: - -#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere -#termios termios.c # Steen Lumholt's termios module -#resource resource.c # Jeremy Hylton's rlimit interface - - -# Multimedia modules -- off by default. -# These don't work for 64-bit platforms!!! -# #993173 says audioop works on 64-bit platforms, though. -# These represent audio samples or images as strings: - -#audioop audioop.c # Operations on audio samples -#imageop imageop.c # Operations on images -#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) - - -# The md5 module implements the RSA Data Security, Inc. MD5 -# Message-Digest Algorithm, described in RFC 1321. The necessary files -# md5c.c and md5.h are included here. - -#md5 md5module.c md5c.c - - -# The sha module implements the SHA checksum algorithm. -# (NIST's Secure Hash Algorithm.) -#sha shamodule.c - - -# SGI IRIX specific modules -- off by default. - -# These module work on any SGI machine: - -# *** gl must be enabled higher up in this file *** -#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager -#sgi sgimodule.c # sgi.nap() and a few more - -# This module requires the header file -# /usr/people/4Dgifts/iristools/include/izoom.h: -#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities - - -# These modules require the Multimedia Development Option (I think): - -#al almodule.c -laudio # Audio Library -#cd cdmodule.c -lcdaudio -lds -lmediad # CD Audio Library -#cl clmodule.c -lcl -lawareaudio # Compression Library -#sv svmodule.c yuvconvert.c -lsvideo -lXext -lX11 # Starter Video - - -# The FORMS library, by Mark Overmars, implements user interface -# components such as dialogs and buttons using SGI's GL and FM -# libraries. You must ftp the FORMS library separately from -# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. -# NOTE: if you want to be able to use FORMS and curses simultaneously -# (or both link them statically into the same binary), you must -# compile all of FORMS with the cc option "-Dclear=__GLclear". - -# The FORMS variable must point to the FORMS subdirectory of the forms -# toplevel directory: - -#FORMS=/ufs/guido/src/forms/FORMS -#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl - - -# SunOS specific modules -- off by default: - -#sunaudiodev sunaudiodev.c - - -# A Linux specific module -- off by default; this may also work on -# some *BSDs. - -#linuxaudiodev linuxaudiodev.c - - -# George Neville-Neil's timing module: - -#timing timingmodule.c - - -# The _tkinter module. -# -# The command for _tkinter is long and site specific. Please -# uncomment and/or edit those parts as indicated. If you don't have a -# specific extension (e.g. Tix or BLT), leave the corresponding line -# commented out. (Leave the trailing backslashes in! If you -# experience strange errors, you may want to join all uncommented -# lines and remove the backslashes -- the backslash interpretation is -# done by the shell's "read" command and it may not be implemented on -# every system. - -# *** Always uncomment this (leave the leading underscore in!): -# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ -# *** Uncomment and edit to reflect where your Tcl/Tk libraries are: -# -L/usr/local/lib \ -# *** Uncomment and edit to reflect where your Tcl/Tk headers are: -# -I/usr/local/include \ -# *** Uncomment and edit to reflect where your X11 header files are: -# -I/usr/X11R6/include \ -# *** Or uncomment this for Solaris: -# -I/usr/openwin/include \ -# *** Uncomment and edit for Tix extension only: -# -DWITH_TIX -ltix8.1.8.2 \ -# *** Uncomment and edit for BLT extension only: -# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ -# *** Uncomment and edit for PIL (TkImaging) extension only: -# (See http://www.pythonware.com/products/pil/ for more info) -# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ -# *** Uncomment and edit for TOGL extension only: -# -DWITH_TOGL togl.c \ -# *** Uncomment and edit to reflect your Tcl/Tk versions: -# -ltk8.2 -ltcl8.2 \ -# *** Uncomment and edit to reflect where your X11 libraries are: -# -L/usr/X11R6/lib \ -# *** Or uncomment this for Solaris: -# -L/usr/openwin/lib \ -# *** Uncomment these for TOGL extension only: -# -lGL -lGLU -lXext -lXmu \ -# *** Uncomment for AIX: -# -lld \ -# *** Always uncomment this; X11 libraries to link with: -# -lX11 - -# Lance Ellinghaus's syslog module -#syslog syslogmodule.c # syslog daemon interface - - -# Curses support, requring the System V version of curses, often -# provided by the ncurses library. e.g. on Linux, link with -lncurses -# instead of -lcurses). -# -# First, look at Setup.config; configure may have set this for you. - -#_curses _cursesmodule.c -lcurses -ltermcap -# Wrapper for the panel library that's part of ncurses and SYSV curses. -#_curses_panel _curses_panel.c -lpanel -lncurses - - -# Generic (SunOS / SVR4) dynamic loading module. -# This is not needed for dynamic loading of Python modules -- -# it is a highly experimental and dangerous device for calling -# *arbitrary* C functions in *arbitrary* shared libraries: - -#dl dlmodule.c - - -# Modules that provide persistent dictionary-like semantics. You will -# probably want to arrange for at least one of them to be available on -# your machine, though none are defined by default because of library -# dependencies. The Python module anydbm.py provides an -# implementation independent wrapper for these; dumbdbm.py provides -# similar functionality (but slower of course) implemented in Python. - -# The standard Unix dbm module has been moved to Setup.config so that -# it will be compiled as a shared library by default. Compiling it as -# a built-in module causes conflicts with the pybsddb3 module since it -# creates a static dependency on an out-of-date version of db.so. -# -# First, look at Setup.config; configure may have set this for you. - -#dbm dbmmodule.c # dbm(3) may require -lndbm or similar - -# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: -# -# First, look at Setup.config; configure may have set this for you. - -#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm - - -# Sleepycat Berkeley DB interface. -# -# This requires the Sleepycat DB code, see http://www.sleepycat.com/ -# The earliest supported version of that library is 3.0, the latest -# supported version is 4.0 (4.1 is specifically not supported, as that -# changes the semantics of transactional databases). A list of available -# releases can be found at -# -# http://www.sleepycat.com/update/index.html -# -# Edit the variables DB and DBLIBVERto point to the db top directory -# and the subdirectory of PORT where you built it. -#DB=/usr/local/BerkeleyDB.4.0 -#DBLIBVER=4.0 -#DBINC=$(DB)/include -#DBLIB=$(DB)/lib -#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) - -# Historical Berkeley DB 1.85 -# -# This module is deprecated; the 1.85 version of the Berkeley DB library has -# bugs that can cause data corruption. If you can, use later versions of the -# library instead, available from . - -#DB=/depot/sundry/src/berkeley-db/db.1.85 -#DBPORT=$(DB)/PORT/irix.5.3 -#bsddb185 bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a - - - -# Helper module for various ascii-encoders -#binascii binascii.c - -# Fred Drake's interface to the Python parser -#parser parsermodule.c - -# cStringIO and cPickle -#cStringIO cStringIO.c -#cPickle cPickle.c - - -# Lee Busby's SIGFPE modules. -# The library to link fpectl with is platform specific. -# Choose *one* of the options below for fpectl: - -# For SGI IRIX (tested on 5.3): -#fpectl fpectlmodule.c -lfpe - -# For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2): -# (Without the compiler you don't have -lsunmath.) -#fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm - -# For other systems: see instructions in fpectlmodule.c. -#fpectl fpectlmodule.c ... - -# Test module for fpectl. No extra libraries needed. -#fpetest fpetestmodule.c - -# Andrew Kuchling's zlib module. -# This require zlib 1.1.3 (or later). -# See http://www.gzip.org/zlib/ -#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz - -# Interface to the Expat XML parser -# -# Expat was written by James Clark and is now maintained by a group of -# developers on SourceForge; see www.libexpat.org for more -# information. The pyexpat module was written by Paul Prescod after a -# prototype by Jack Jansen. Source of Expat 1.95.2 is included in -# Modules/expat/. Usage of a system shared libexpat.so/expat.dll is -# not advised. -# -# More information on Expat can be found at www.libexpat.org. -# -#EXPAT_DIR=/usr/local/src/expat-1.95.2 -#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat - - -# Hye-Shik Chang's CJKCodecs - -# multibytecodec is required for all the other CJK codec modules -#_multibytecodec cjkcodecs/multibytecodec.c - -#_codecs_cn cjkcodecs/_codecs_cn.c -#_codecs_hk cjkcodecs/_codecs_hk.c -#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c -#_codecs_jp cjkcodecs/_codecs_jp.c -#_codecs_kr cjkcodecs/_codecs_kr.c -#_codecs_tw cjkcodecs/_codecs_tw.c - -# Example -- included for reference only: -# xx xxmodule.c - -# Another example -- the 'xxsubtype' module shows C-level subtyping in action -xxsubtype xxsubtype.c - -# uncomment if you'd like to compile stackless statically. -# Note that the static build puts the .o files into Modules. -#SLP=./Stackless -#stackless $(SLP)/stacklessmodule.c $(SLP)/atomicobject.c $(SLP)/cframeobject.c $(SLP)/channelobject.c $(SLP)/flextype.c $(SLP)/scheduling.c $(SLP)/schedulerobject.c $(SLP)/stackless_debug.c $(SLP)/stackless_util.c $(SLP)/taskletobject.c +# -*- makefile -*- +# The file Setup is used by the makesetup script to construct the files +# Makefile and config.c, from Makefile.pre and config.c.in, +# respectively. The file Setup itself is initially copied from +# Setup.dist; once it exists it will not be overwritten, so you can edit +# Setup to your heart's content. Note that Makefile.pre is created +# from Makefile.pre.in by the toplevel configure script. + +# (VPATH notes: Setup and Makefile.pre are in the build directory, as +# are Makefile and config.c; the *.in and *.dist files are in the source +# directory.) + +# Each line in this file describes one or more optional modules. +# Modules enabled here will not be compiled by the setup.py script, +# so the file can be used to override setup.py's behavior. + +# Lines have the following structure: +# +# ... [ ...] [ ...] [ ...] +# +# is anything ending in .c (.C, .cc, .c++ are C++ files) +# is anything starting with -I, -D, -U or -C +# is anything ending in .a or beginning with -l or -L +# is anything else but should be a valid Python +# identifier (letters, digits, underscores, beginning with non-digit) +# +# (As the makesetup script changes, it may recognize some other +# arguments as well, e.g. *.so and *.sl as libraries. See the big +# case statement in the makesetup script.) +# +# Lines can also have the form +# +# = +# +# which defines a Make variable definition inserted into Makefile.in +# +# Finally, if a line contains just the word "*shared*" (without the +# quotes but with the stars), then the following modules will not be +# built statically. The build process works like this: +# +# 1. Build all modules that are declared as static in Modules/Setup, +# combine them into libpythonxy.a, combine that into python. +# 2. Build all modules that are listed as shared in Modules/Setup. +# 3. Invoke setup.py. That builds all modules that +# a) are not builtin, and +# b) are not listed in Modules/Setup, and +# c) can be build on the target +# +# Therefore, modules declared to be shared will not be +# included in the config.c file, nor in the list of objects to be +# added to the library archive, and their linker options won't be +# added to the linker options. Rules to create their .o files and +# their shared libraries will still be added to the Makefile, and +# their names will be collected in the Make variable SHAREDMODS. This +# is used to build modules as shared libraries. (They can be +# installed using "make sharedinstall", which is implied by the +# toplevel "make install" target.) (For compatibility, +# *noconfig* has the same effect as *shared*.) +# +# In addition, *static* explicitly declares the following modules to +# be static. Lines containing "*static*" and "*shared*" may thus +# alternate thoughout this file. + +# NOTE: As a standard policy, as many modules as can be supported by a +# platform should be present. The distribution comes with all modules +# enabled that are supported by most platforms and don't require you +# to ftp sources from elsewhere. + + +# Some special rules to define PYTHONPATH. +# Edit the definitions below to indicate which options you are using. +# Don't add any whitespace or comments! + +# Directories where library files get installed. +# DESTLIB is for Python modules; MACHDESTLIB for shared libraries. +DESTLIB=$(LIBDEST) +MACHDESTLIB=$(BINLIBDEST) + +# NOTE: all the paths are now relative to the prefix that is computed +# at run time! + +# Standard path -- don't edit. +# No leading colon since this is the first entry. +# Empty since this is now just the runtime prefix. +DESTPATH= + +# Site specific path components -- should begin with : if non-empty +SITEPATH= + +# Standard path components for test modules +TESTPATH= + +# Path components for machine- or system-dependent modules and shared libraries +MACHDEPPATH=:plat-$(MACHDEP) +EXTRAMACHDEPPATH= + +# Path component for the Tkinter-related modules +# The TKPATH variable is always enabled, to save you the effort. +TKPATH=:lib-tk + +COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH) +PYTHONPATH=$(COREPYTHONPATH) + + +# The modules listed here can't be built as shared libraries for +# various reasons; therefore they are listed here instead of in the +# normal order. + +# This only contains the minimal set of modules required to run the +# setup.py script in the root of the Python source tree. + +posix posixmodule.c # posix (UNIX) system calls +errno errnomodule.c # posix (UNIX) errno values +pwd pwdmodule.c # this is needed to find out the user's home dir + # if $HOME is not set +_sre _sre.c # Fredrik Lundh's new regular expressions +_codecs _codecsmodule.c # access to the builtin codecs and codec registry + +# The zipimport module is always imported at startup. Having it as a +# builtin module avoids some bootstrapping problems and reduces overhead. +zipimport zipimport.c + +# The rest of the modules listed in this file are all commented out by +# default. Usually they can be detected and built as dynamically +# loaded modules by the new setup.py script added in Python 2.1. If +# you're on a platform that doesn't support dynamic loading, want to +# compile modules statically into the Python binary, or need to +# specify some odd set of compiler switches, you can uncomment the +# appropriate lines below. + +# ====================================================================== + +# The Python symtable module depends on .h files that setup.py doesn't track +_symtable symtablemodule.c + +# The SGI specific GL module: + +GLHACK=-Dclear=__GLclear +#gl glmodule.c cgensupport.c -I$(srcdir) $(GLHACK) -lgl -lX11 + +# Pure module. Cannot be linked dynamically. +# -DWITH_QUANTIFY, -DWITH_PURIFY, or -DWITH_ALL_PURE +#WHICH_PURE_PRODUCTS=-DWITH_ALL_PURE +#PURE_INCLS=-I/usr/local/include +#PURE_STUBLIBS=-L/usr/local/lib -lpurify_stubs -lquantify_stubs +#pure puremodule.c $(WHICH_PURE_PRODUCTS) $(PURE_INCLS) $(PURE_STUBLIBS) + +# Uncommenting the following line tells makesetup that all following +# modules are to be built as shared libraries (see above for more +# detail; also note that *static* reverses this effect): + +#*shared* + +# GNU readline. Unlike previous Python incarnations, GNU readline is +# now incorporated in an optional module, configured in the Setup file +# instead of by a configure script switch. You may have to insert a +# -L option pointing to the directory where libreadline.* lives, +# and you may have to change -ltermcap to -ltermlib or perhaps remove +# it, depending on your system -- see the GNU readline instructions. +# It's okay for this to be a shared library, too. + +#readline readline.c -lreadline -ltermcap + + +# Modules that should always be present (non UNIX dependent): + +#array arraymodule.c # array objects +#cmath cmathmodule.c # -lm # complex math library functions +#math mathmodule.c # -lm # math library functions, e.g. sin() +#struct structmodule.c # binary structure packing/unpacking +#time timemodule.c # -lm # time operations and variables +#operator operator.c # operator.add() and similar goodies +#_weakref _weakref.c # basic weak reference support +#_testcapi _testcapimodule.c # Python C API test module +#_random _randommodule.c # Random number generator +#collections collectionsmodule.c # Container types +#itertools itertoolsmodule.c # Functions creating iterators for efficient looping +#strop stropmodule.c # String manipulations + +#unicodedata unicodedata.c # static Unicode character database + +# access to ISO C locale support +#_locale _localemodule.c # -lintl + + +# Modules with some UNIX dependencies -- on by default: +# (If you have a really backward UNIX, select and socket may not be +# supported...) + +#fcntl fcntlmodule.c # fcntl(2) and ioctl(2) +#grp grpmodule.c # grp(3) +#select selectmodule.c # select(2); not on ancient System V + +# Memory-mapped files (also works on Win32). +#mmap mmapmodule.c + +# CSV file helper +#_csv _csv.c + +# Socket module helper for socket(2) +#_socket socketmodule.c + +# Socket module helper for SSL support; you must comment out the other +# socket line above, and possibly edit the SSL variable: +#SSL=/usr/local/ssl +#_ssl _ssl.c \ +# -DUSE_SSL -I$(SSL)/include -I$(SSL)/include/openssl \ +# -L$(SSL)/lib -lssl -lcrypto + +# The crypt module is now disabled by default because it breaks builds +# on many systems (where -lcrypt is needed), e.g. Linux (I believe). +# +# First, look at Setup.config; configure may have set this for you. + +#crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems + + +# Some more UNIX dependent modules -- off by default, since these +# are not supported by all UNIX systems: + +#nis nismodule.c -lnsl # Sun yellow pages -- not everywhere +#termios termios.c # Steen Lumholt's termios module +#resource resource.c # Jeremy Hylton's rlimit interface + + +# Multimedia modules -- off by default. +# These don't work for 64-bit platforms!!! +# #993173 says audioop works on 64-bit platforms, though. +# These represent audio samples or images as strings: + +#audioop audioop.c # Operations on audio samples +#imageop imageop.c # Operations on images +#rgbimg rgbimgmodule.c # Read SGI RGB image files (but coded portably) + + +# The md5 module implements the RSA Data Security, Inc. MD5 +# Message-Digest Algorithm, described in RFC 1321. The necessary files +# md5c.c and md5.h are included here. + +#md5 md5module.c md5c.c + + +# The sha module implements the SHA checksum algorithm. +# (NIST's Secure Hash Algorithm.) +#sha shamodule.c + + +# SGI IRIX specific modules -- off by default. + +# These module work on any SGI machine: + +# *** gl must be enabled higher up in this file *** +#fm fmmodule.c $(GLHACK) -lfm -lgl # Font Manager +#sgi sgimodule.c # sgi.nap() and a few more + +# This module requires the header file +# /usr/people/4Dgifts/iristools/include/izoom.h: +#imgfile imgfile.c -limage -lgutil -lgl -lm # Image Processing Utilities + + +# These modules require the Multimedia Development Option (I think): + +#al almodule.c -laudio # Audio Library +#cd cdmodule.c -lcdaudio -lds -lmediad # CD Audio Library +#cl clmodule.c -lcl -lawareaudio # Compression Library +#sv svmodule.c yuvconvert.c -lsvideo -lXext -lX11 # Starter Video + + +# The FORMS library, by Mark Overmars, implements user interface +# components such as dialogs and buttons using SGI's GL and FM +# libraries. You must ftp the FORMS library separately from +# ftp://ftp.cs.ruu.nl/pub/SGI/FORMS. It was tested with FORMS 2.2a. +# NOTE: if you want to be able to use FORMS and curses simultaneously +# (or both link them statically into the same binary), you must +# compile all of FORMS with the cc option "-Dclear=__GLclear". + +# The FORMS variable must point to the FORMS subdirectory of the forms +# toplevel directory: + +#FORMS=/ufs/guido/src/forms/FORMS +#fl flmodule.c -I$(FORMS) $(GLHACK) $(FORMS)/libforms.a -lfm -lgl + + +# SunOS specific modules -- off by default: + +#sunaudiodev sunaudiodev.c + + +# A Linux specific module -- off by default; this may also work on +# some *BSDs. + +#linuxaudiodev linuxaudiodev.c + + +# George Neville-Neil's timing module: + +#timing timingmodule.c + + +# The _tkinter module. +# +# The command for _tkinter is long and site specific. Please +# uncomment and/or edit those parts as indicated. If you don't have a +# specific extension (e.g. Tix or BLT), leave the corresponding line +# commented out. (Leave the trailing backslashes in! If you +# experience strange errors, you may want to join all uncommented +# lines and remove the backslashes -- the backslash interpretation is +# done by the shell's "read" command and it may not be implemented on +# every system. + +# *** Always uncomment this (leave the leading underscore in!): +# _tkinter _tkinter.c tkappinit.c -DWITH_APPINIT \ +# *** Uncomment and edit to reflect where your Tcl/Tk libraries are: +# -L/usr/local/lib \ +# *** Uncomment and edit to reflect where your Tcl/Tk headers are: +# -I/usr/local/include \ +# *** Uncomment and edit to reflect where your X11 header files are: +# -I/usr/X11R6/include \ +# *** Or uncomment this for Solaris: +# -I/usr/openwin/include \ +# *** Uncomment and edit for Tix extension only: +# -DWITH_TIX -ltix8.1.8.2 \ +# *** Uncomment and edit for BLT extension only: +# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \ +# *** Uncomment and edit for PIL (TkImaging) extension only: +# (See http://www.pythonware.com/products/pil/ for more info) +# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \ +# *** Uncomment and edit for TOGL extension only: +# -DWITH_TOGL togl.c \ +# *** Uncomment and edit to reflect your Tcl/Tk versions: +# -ltk8.2 -ltcl8.2 \ +# *** Uncomment and edit to reflect where your X11 libraries are: +# -L/usr/X11R6/lib \ +# *** Or uncomment this for Solaris: +# -L/usr/openwin/lib \ +# *** Uncomment these for TOGL extension only: +# -lGL -lGLU -lXext -lXmu \ +# *** Uncomment for AIX: +# -lld \ +# *** Always uncomment this; X11 libraries to link with: +# -lX11 + +# Lance Ellinghaus's syslog module +#syslog syslogmodule.c # syslog daemon interface + + +# Curses support, requring the System V version of curses, often +# provided by the ncurses library. e.g. on Linux, link with -lncurses +# instead of -lcurses). +# +# First, look at Setup.config; configure may have set this for you. + +#_curses _cursesmodule.c -lcurses -ltermcap +# Wrapper for the panel library that's part of ncurses and SYSV curses. +#_curses_panel _curses_panel.c -lpanel -lncurses + + +# Generic (SunOS / SVR4) dynamic loading module. +# This is not needed for dynamic loading of Python modules -- +# it is a highly experimental and dangerous device for calling +# *arbitrary* C functions in *arbitrary* shared libraries: + +#dl dlmodule.c + + +# Modules that provide persistent dictionary-like semantics. You will +# probably want to arrange for at least one of them to be available on +# your machine, though none are defined by default because of library +# dependencies. The Python module anydbm.py provides an +# implementation independent wrapper for these; dumbdbm.py provides +# similar functionality (but slower of course) implemented in Python. + +# The standard Unix dbm module has been moved to Setup.config so that +# it will be compiled as a shared library by default. Compiling it as +# a built-in module causes conflicts with the pybsddb3 module since it +# creates a static dependency on an out-of-date version of db.so. +# +# First, look at Setup.config; configure may have set this for you. + +#dbm dbmmodule.c # dbm(3) may require -lndbm or similar + +# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm: +# +# First, look at Setup.config; configure may have set this for you. + +#gdbm gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm + + +# Sleepycat Berkeley DB interface. +# +# This requires the Sleepycat DB code, see http://www.sleepycat.com/ +# The earliest supported version of that library is 3.0, the latest +# supported version is 4.0 (4.1 is specifically not supported, as that +# changes the semantics of transactional databases). A list of available +# releases can be found at +# +# http://www.sleepycat.com/update/index.html +# +# Edit the variables DB and DBLIBVERto point to the db top directory +# and the subdirectory of PORT where you built it. +#DB=/usr/local/BerkeleyDB.4.0 +#DBLIBVER=4.0 +#DBINC=$(DB)/include +#DBLIB=$(DB)/lib +#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER) + +# Historical Berkeley DB 1.85 +# +# This module is deprecated; the 1.85 version of the Berkeley DB library has +# bugs that can cause data corruption. If you can, use later versions of the +# library instead, available from . + +#DB=/depot/sundry/src/berkeley-db/db.1.85 +#DBPORT=$(DB)/PORT/irix.5.3 +#bsddb185 bsddbmodule.c -I$(DBPORT)/include -I$(DBPORT) $(DBPORT)/libdb.a + + + +# Helper module for various ascii-encoders +#binascii binascii.c + +# Fred Drake's interface to the Python parser +#parser parsermodule.c + +# cStringIO and cPickle +#cStringIO cStringIO.c +#cPickle cPickle.c + + +# Lee Busby's SIGFPE modules. +# The library to link fpectl with is platform specific. +# Choose *one* of the options below for fpectl: + +# For SGI IRIX (tested on 5.3): +#fpectl fpectlmodule.c -lfpe + +# For Solaris with SunPro compiler (tested on Solaris 2.5 with SunPro C 4.2): +# (Without the compiler you don't have -lsunmath.) +#fpectl fpectlmodule.c -R/opt/SUNWspro/lib -lsunmath -lm + +# For other systems: see instructions in fpectlmodule.c. +#fpectl fpectlmodule.c ... + +# Test module for fpectl. No extra libraries needed. +#fpetest fpetestmodule.c + +# Andrew Kuchling's zlib module. +# This require zlib 1.1.3 (or later). +# See http://www.gzip.org/zlib/ +#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz + +# Interface to the Expat XML parser +# +# Expat was written by James Clark and is now maintained by a group of +# developers on SourceForge; see www.libexpat.org for more +# information. The pyexpat module was written by Paul Prescod after a +# prototype by Jack Jansen. Source of Expat 1.95.2 is included in +# Modules/expat/. Usage of a system shared libexpat.so/expat.dll is +# not advised. +# +# More information on Expat can be found at www.libexpat.org. +# +#EXPAT_DIR=/usr/local/src/expat-1.95.2 +#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat + + +# Hye-Shik Chang's CJKCodecs + +# multibytecodec is required for all the other CJK codec modules +#_multibytecodec cjkcodecs/multibytecodec.c + +#_codecs_cn cjkcodecs/_codecs_cn.c +#_codecs_hk cjkcodecs/_codecs_hk.c +#_codecs_iso2022 cjkcodecs/_codecs_iso2022.c +#_codecs_jp cjkcodecs/_codecs_jp.c +#_codecs_kr cjkcodecs/_codecs_kr.c +#_codecs_tw cjkcodecs/_codecs_tw.c + +# Example -- included for reference only: +# xx xxmodule.c + +# Another example -- the 'xxsubtype' module shows C-level subtyping in action +xxsubtype xxsubtype.c + +# uncomment if you'd like to compile stackless statically. +# Note that the static build puts the .o files into Modules. +#SLP=./Stackless +#stackless $(SLP)/stacklessmodule.c $(SLP)/atomicobject.c $(SLP)/cframeobject.c $(SLP)/channelobject.c $(SLP)/flextype.c $(SLP)/scheduling.c $(SLP)/schedulerobject.c $(SLP)/stackless_debug.c $(SLP)/stackless_util.c $(SLP)/taskletobject.c Modified: stackless/Python-2.4.3/dev/Modules/config.c.in ============================================================================== --- stackless/Python-2.4.3/dev/Modules/config.c.in (original) +++ stackless/Python-2.4.3/dev/Modules/config.c.in Fri May 5 19:50:05 2006 @@ -1,48 +1,48 @@ -/* -*- C -*- *********************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/* Module configuration */ - -/* !!! !!! !!! This file is edited by the makesetup script !!! !!! !!! */ - -/* This file contains the table of built-in modules. - See init_builtin() in import.c. */ - -#include "Python.h" - - -/* -- ADDMODULE MARKER 1 -- */ - -extern void PyMarshal_Init(void); -extern void initimp(void); -extern void initgc(void); - -struct _inittab _PyImport_Inittab[] = { - -/* -- ADDMODULE MARKER 2 -- */ - - /* This module lives in marshal.c */ - {"marshal", PyMarshal_Init}, - - /* This lives in import.c */ - {"imp", initimp}, - - /* These entries are here for sys.builtin_module_names */ - {"__main__", NULL}, - {"__builtin__", NULL}, - {"sys", NULL}, - {"exceptions", NULL}, - - /* This lives in gcmodule.c */ - {"gc", initgc}, - - /* Sentinel */ - {0, 0} -}; +/* -*- C -*- *********************************************** +Copyright (c) 2000, BeOpen.com. +Copyright (c) 1995-2000, Corporation for National Research Initiatives. +Copyright (c) 1990-1995, Stichting Mathematisch Centrum. +All rights reserved. + +See the file "Misc/COPYRIGHT" for information on usage and +redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. +******************************************************************/ + +/* Module configuration */ + +/* !!! !!! !!! This file is edited by the makesetup script !!! !!! !!! */ + +/* This file contains the table of built-in modules. + See init_builtin() in import.c. */ + +#include "Python.h" + + +/* -- ADDMODULE MARKER 1 -- */ + +extern void PyMarshal_Init(void); +extern void initimp(void); +extern void initgc(void); + +struct _inittab _PyImport_Inittab[] = { + +/* -- ADDMODULE MARKER 2 -- */ + + /* This module lives in marshal.c */ + {"marshal", PyMarshal_Init}, + + /* This lives in import.c */ + {"imp", initimp}, + + /* These entries are here for sys.builtin_module_names */ + {"__main__", NULL}, + {"__builtin__", NULL}, + {"sys", NULL}, + {"exceptions", NULL}, + + /* This lives in gcmodule.c */ + {"gc", initgc}, + + /* Sentinel */ + {0, 0} +}; Modified: stackless/Python-2.4.3/dev/Modules/makesetup ============================================================================== --- stackless/Python-2.4.3/dev/Modules/makesetup (original) +++ stackless/Python-2.4.3/dev/Modules/makesetup Fri May 5 19:50:05 2006 @@ -1,297 +1,297 @@ -#! /bin/sh - -# Convert templates into Makefile and config.c, based on the module -# definitions found in the file Setup. -# -# Usage: makesetup [-s dir] [-c file] [-m file] [Setup] ... [-n [Setup] ...] -# -# Options: -# -s directory: alternative source directory (default .) -# -l directory: library source directory (default derived from $0) -# -c file: alternative config.c template (default $libdir/config.c.in) -# -c -: don't write config.c -# -m file: alternative Makefile template (default ./Makefile.pre) -# -m -: don't write Makefile -# -# Remaining arguments are one or more Setup files (default ./Setup). -# Setup files after a -n option are used for their variables, modules -# and libraries but not for their .o files. -# -# See Setup.dist for a description of the format of the Setup file. -# -# The following edits are made: -# -# Copying config.c.in to config.c: -# - insert an identifying comment at the start -# - for each mentioned in Setup before *noconfig*: -# + insert 'extern void init(void);' before MARKER 1 -# + insert '{"", initmodule},' before MARKER 2 -# -# Copying Makefile.pre to Makefile: -# - insert an identifying comment at the start -# - replace _MODOBJS_ by the list of objects from Setup (except for -# Setup files after a -n option) -# - replace _MODLIBS_ by the list of libraries from Setup -# - for each object file mentioned in Setup, append a rule -# '.o: .c; ' to the end of the Makefile -# - for each module mentioned in Setup, append a rule -# which creates a shared library version to the end of the Makefile -# - for each variable definition found in Setup, insert the definition -# before the comment 'Definitions added by makesetup' - -# Loop over command line options -usage=' -usage: makesetup [-s srcdir] [-l libdir] [-c config.c.in] [-m Makefile.pre] - [Setup] ... [-n [Setup] ...]' -srcdir='.' -libdir='' -config='' -makepre='' -noobjects='' -doconfig=yes -while : -do - case $1 in - -s) shift; srcdir=$1; shift;; - -l) shift; libdir=$1; shift;; - -c) shift; config=$1; shift;; - -m) shift; makepre=$1; shift;; - --) shift; break;; - -n) noobjects=yes;; - -*) echo "$usage" 1>&2; exit 2;; - *) break;; - esac -done - -# Set default libdir and config if not set by command line -# (Not all systems have dirname) -case $libdir in -'') case $0 in - */*) libdir=`echo $0 | sed 's,/[^/]*$,,'`;; - *) libdir=.;; - esac;; -esac -case $config in -'') config=$libdir/config.c.in;; -esac -case $makepre in -'') makepre=Makefile.pre;; -esac - -# Newline for sed i and a commands -NL='\ -' - -# Setup to link with extra libraries when makeing shared extensions. -# Currently, only Cygwin needs this baggage. -case `uname -s` in -CYGWIN*) if test $libdir = . - then - ExtraLibDir=. - else - ExtraLibDir='$(LIBPL)' - fi - ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";; -esac - -# Main loop -for i in ${*-Setup} -do - case $i in - -n) echo '*noobjects*';; - *) echo '*doconfig*'; cat "$i";; - esac -done | -sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | -( - rulesf="@rules.$$" - trap 'rm -f $rulesf' 0 1 2 3 - echo " -# Rules appended by makedepend -" >$rulesf - DEFS= - MODS= - SHAREDMODS= - OBJS= - LIBS= - LOCALLIBS= - BASELIBS= - while read line - do - # to handle backslashes for sh's that don't automatically - # continue a read when the last char is a backslash - while echo $line | grep '\\$' > /dev/null - do - read extraline - line=`echo $line| sed s/.$//`$extraline - done - - # Output DEFS in reverse order so first definition overrides - case $line in - *=*) DEFS="$line$NL$DEFS"; continue;; - 'include '*) DEFS="$line$NL$DEFS"; continue;; - '*noobjects*') - case $noobjects in - yes) ;; - *) LOCALLIBS=$LIBS; LIBS=;; - esac - noobjects=yes; - continue;; - '*doconfig*') doconfig=yes; continue;; - '*static*') doconfig=yes; continue;; - '*noconfig*') doconfig=no; continue;; - '*shared*') doconfig=no; continue;; - esac - srcs= - cpps= - libs= - mods= - skip= - for arg in $line - do - case $skip in - libs) libs="$libs $arg"; skip=; continue;; - cpps) cpps="$cpps $arg"; skip=; continue;; - srcs) srcs="$srcs $arg"; skip=; continue;; - esac - case $arg in - -framework) libs="$libs $arg"; skip=libs; - # OSX/OSXS/Darwin framework link cmd - ;; - -[IDUCfF]*) cpps="$cpps $arg";; - -Xcompiler) skip=cpps;; - -Xlinker) libs="$libs $arg"; skip=libs;; - -rpath) libs="$libs $arg"; skip=libs;; - --rpath) libs="$libs $arg"; skip=libs;; - -[A-Zl]*) libs="$libs $arg";; - *.a) libs="$libs $arg";; - *.so) libs="$libs $arg";; - *.sl) libs="$libs $arg";; - /*.o) libs="$libs $arg";; - *.def) libs="$libs $arg";; - *.o) srcs="$srcs `basename $arg .o`.c";; - *.[cC]) srcs="$srcs $arg";; - *.m) srcs="$srcs $arg";; # Objective-C src - *.cc) srcs="$srcs $arg";; - *.c++) srcs="$srcs $arg";; - *.cxx) srcs="$srcs $arg";; - *.cpp) srcs="$srcs $arg";; - \$*) libs="$libs $arg" - cpps="$cpps $arg";; - *.*) echo 1>&2 "bad word $arg in $line" - exit 1;; - -u) skip=libs; libs="$libs -u";; - [a-zA-Z_]*) mods="$mods $arg";; - *) echo 1>&2 "bad word $arg in $line" - exit 1;; - esac - done - case $doconfig in - yes) - LIBS="$LIBS $libs" - MODS="$MODS $mods" - ;; - esac - case $noobjects in - yes) continue;; - esac - objs='' - for src in $srcs - do - case $src in - *.c) obj=`basename $src .c`.o; cc='$(CC)';; - *.cc) obj=`basename $src .cc`.o; cc='$(CXX)';; - *.c++) obj=`basename $src .c++`.o; cc='$(CXX)';; - *.C) obj=`basename $src .C`.o; cc='$(CXX)';; - *.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';; - *.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';; - *.m) obj=`basename $src .m`.o; cc='$(CC)';; # Obj-C - *) continue;; - esac - obj="$srcdir/$obj" - objs="$objs $obj" - case $src in - glmodule.c) ;; - /*) ;; - \$*) ;; - *) src='$(srcdir)/'"$srcdir/$src";; - esac - case $doconfig in - no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; - *) - cc="$cc \$(PY_CFLAGS)";; - esac - rule="$obj: $src; $cc $cpps -c $src -o $obj" - echo "$rule" >>$rulesf - done - case $doconfig in - yes) OBJS="$OBJS $objs";; - esac - for mod in $mods - do - case $objs in - *$mod.o*) base=$mod;; - *) base=${mod}module;; - esac - file="$srcdir/$base\$(SO)" - case $doconfig in - no) SHAREDMODS="$SHAREDMODS $file";; - esac - rule="$file: $objs" - rule="$rule; \$(LDSHARED) $objs $libs $ExtraLibs -o $file" - echo "$rule" >>$rulesf - done - done - - case $SHAREDMODS in - '') ;; - *) DEFS="SHAREDMODS=$SHAREDMODS$NL$DEFS";; - esac - - case $noobjects in - yes) BASELIBS=$LIBS;; - *) LOCALLIBS=$LIBS;; - esac - LIBS='$(LOCALMODLIBS) $(BASEMODLIBS)' - DEFS="BASEMODLIBS=$BASELIBS$NL$DEFS" - DEFS="LOCALMODLIBS=$LOCALLIBS$NL$DEFS" - - EXTDECLS= - INITBITS= - for mod in $MODS - do - EXTDECLS="${EXTDECLS}extern void init$mod(void);$NL" - INITBITS="${INITBITS} {\"$mod\", init$mod},$NL" - done - - - case $config in - -) ;; - *) sed -e " - 1i$NL/* Generated automatically from $config by makesetup. */ - /MARKER 1/i$NL$EXTDECLS - - /MARKER 2/i$NL$INITBITS - - " $config >config.c - ;; - esac - - case $makepre in - -) ;; - *) sedf="@sed.in.$$" - trap 'rm -f $sedf' 0 1 2 3 - echo "1i\\" >$sedf - str="# Generated automatically from $makepre by makesetup." - echo "$str" >>$sedf - echo "s%_MODOBJS_%$OBJS%" >>$sedf - echo "s%_MODLIBS_%$LIBS%" >>$sedf - echo "/Definitions added by makesetup/a$NL$NL$DEFS" >>$sedf - sed -f $sedf $makepre >Makefile - cat $rulesf >>Makefile - rm -f $sedf - ;; - esac - - rm -f $rulesf -) +#! /bin/sh + +# Convert templates into Makefile and config.c, based on the module +# definitions found in the file Setup. +# +# Usage: makesetup [-s dir] [-c file] [-m file] [Setup] ... [-n [Setup] ...] +# +# Options: +# -s directory: alternative source directory (default .) +# -l directory: library source directory (default derived from $0) +# -c file: alternative config.c template (default $libdir/config.c.in) +# -c -: don't write config.c +# -m file: alternative Makefile template (default ./Makefile.pre) +# -m -: don't write Makefile +# +# Remaining arguments are one or more Setup files (default ./Setup). +# Setup files after a -n option are used for their variables, modules +# and libraries but not for their .o files. +# +# See Setup.dist for a description of the format of the Setup file. +# +# The following edits are made: +# +# Copying config.c.in to config.c: +# - insert an identifying comment at the start +# - for each mentioned in Setup before *noconfig*: +# + insert 'extern void init(void);' before MARKER 1 +# + insert '{"", initmodule},' before MARKER 2 +# +# Copying Makefile.pre to Makefile: +# - insert an identifying comment at the start +# - replace _MODOBJS_ by the list of objects from Setup (except for +# Setup files after a -n option) +# - replace _MODLIBS_ by the list of libraries from Setup +# - for each object file mentioned in Setup, append a rule +# '.o: .c; ' to the end of the Makefile +# - for each module mentioned in Setup, append a rule +# which creates a shared library version to the end of the Makefile +# - for each variable definition found in Setup, insert the definition +# before the comment 'Definitions added by makesetup' + +# Loop over command line options +usage=' +usage: makesetup [-s srcdir] [-l libdir] [-c config.c.in] [-m Makefile.pre] + [Setup] ... [-n [Setup] ...]' +srcdir='.' +libdir='' +config='' +makepre='' +noobjects='' +doconfig=yes +while : +do + case $1 in + -s) shift; srcdir=$1; shift;; + -l) shift; libdir=$1; shift;; + -c) shift; config=$1; shift;; + -m) shift; makepre=$1; shift;; + --) shift; break;; + -n) noobjects=yes;; + -*) echo "$usage" 1>&2; exit 2;; + *) break;; + esac +done + +# Set default libdir and config if not set by command line +# (Not all systems have dirname) +case $libdir in +'') case $0 in + */*) libdir=`echo $0 | sed 's,/[^/]*$,,'`;; + *) libdir=.;; + esac;; +esac +case $config in +'') config=$libdir/config.c.in;; +esac +case $makepre in +'') makepre=Makefile.pre;; +esac + +# Newline for sed i and a commands +NL='\ +' + +# Setup to link with extra libraries when makeing shared extensions. +# Currently, only Cygwin needs this baggage. +case `uname -s` in +CYGWIN*) if test $libdir = . + then + ExtraLibDir=. + else + ExtraLibDir='$(LIBPL)' + fi + ExtraLibs="-L$ExtraLibDir -lpython\$(VERSION)";; +esac + +# Main loop +for i in ${*-Setup} +do + case $i in + -n) echo '*noobjects*';; + *) echo '*doconfig*'; cat "$i";; + esac +done | +sed -e 's/[ ]*#.*//' -e '/^[ ]*$/d' | +( + rulesf="@rules.$$" + trap 'rm -f $rulesf' 0 1 2 3 + echo " +# Rules appended by makedepend +" >$rulesf + DEFS= + MODS= + SHAREDMODS= + OBJS= + LIBS= + LOCALLIBS= + BASELIBS= + while read line + do + # to handle backslashes for sh's that don't automatically + # continue a read when the last char is a backslash + while echo $line | grep '\\$' > /dev/null + do + read extraline + line=`echo $line| sed s/.$//`$extraline + done + + # Output DEFS in reverse order so first definition overrides + case $line in + *=*) DEFS="$line$NL$DEFS"; continue;; + 'include '*) DEFS="$line$NL$DEFS"; continue;; + '*noobjects*') + case $noobjects in + yes) ;; + *) LOCALLIBS=$LIBS; LIBS=;; + esac + noobjects=yes; + continue;; + '*doconfig*') doconfig=yes; continue;; + '*static*') doconfig=yes; continue;; + '*noconfig*') doconfig=no; continue;; + '*shared*') doconfig=no; continue;; + esac + srcs= + cpps= + libs= + mods= + skip= + for arg in $line + do + case $skip in + libs) libs="$libs $arg"; skip=; continue;; + cpps) cpps="$cpps $arg"; skip=; continue;; + srcs) srcs="$srcs $arg"; skip=; continue;; + esac + case $arg in + -framework) libs="$libs $arg"; skip=libs; + # OSX/OSXS/Darwin framework link cmd + ;; + -[IDUCfF]*) cpps="$cpps $arg";; + -Xcompiler) skip=cpps;; + -Xlinker) libs="$libs $arg"; skip=libs;; + -rpath) libs="$libs $arg"; skip=libs;; + --rpath) libs="$libs $arg"; skip=libs;; + -[A-Zl]*) libs="$libs $arg";; + *.a) libs="$libs $arg";; + *.so) libs="$libs $arg";; + *.sl) libs="$libs $arg";; + /*.o) libs="$libs $arg";; + *.def) libs="$libs $arg";; + *.o) srcs="$srcs `basename $arg .o`.c";; + *.[cC]) srcs="$srcs $arg";; + *.m) srcs="$srcs $arg";; # Objective-C src + *.cc) srcs="$srcs $arg";; + *.c++) srcs="$srcs $arg";; + *.cxx) srcs="$srcs $arg";; + *.cpp) srcs="$srcs $arg";; + \$*) libs="$libs $arg" + cpps="$cpps $arg";; + *.*) echo 1>&2 "bad word $arg in $line" + exit 1;; + -u) skip=libs; libs="$libs -u";; + [a-zA-Z_]*) mods="$mods $arg";; + *) echo 1>&2 "bad word $arg in $line" + exit 1;; + esac + done + case $doconfig in + yes) + LIBS="$LIBS $libs" + MODS="$MODS $mods" + ;; + esac + case $noobjects in + yes) continue;; + esac + objs='' + for src in $srcs + do + case $src in + *.c) obj=`basename $src .c`.o; cc='$(CC)';; + *.cc) obj=`basename $src .cc`.o; cc='$(CXX)';; + *.c++) obj=`basename $src .c++`.o; cc='$(CXX)';; + *.C) obj=`basename $src .C`.o; cc='$(CXX)';; + *.cxx) obj=`basename $src .cxx`.o; cc='$(CXX)';; + *.cpp) obj=`basename $src .cpp`.o; cc='$(CXX)';; + *.m) obj=`basename $src .m`.o; cc='$(CC)';; # Obj-C + *) continue;; + esac + obj="$srcdir/$obj" + objs="$objs $obj" + case $src in + glmodule.c) ;; + /*) ;; + \$*) ;; + *) src='$(srcdir)/'"$srcdir/$src";; + esac + case $doconfig in + no) cc="$cc \$(CCSHARED) \$(CFLAGS) \$(CPPFLAGS)";; + *) + cc="$cc \$(PY_CFLAGS)";; + esac + rule="$obj: $src; $cc $cpps -c $src -o $obj" + echo "$rule" >>$rulesf + done + case $doconfig in + yes) OBJS="$OBJS $objs";; + esac + for mod in $mods + do + case $objs in + *$mod.o*) base=$mod;; + *) base=${mod}module;; + esac + file="$srcdir/$base\$(SO)" + case $doconfig in + no) SHAREDMODS="$SHAREDMODS $file";; + esac + rule="$file: $objs" + rule="$rule; \$(LDSHARED) $objs $libs $ExtraLibs -o $file" + echo "$rule" >>$rulesf + done + done + + case $SHAREDMODS in + '') ;; + *) DEFS="SHAREDMODS=$SHAREDMODS$NL$DEFS";; + esac + + case $noobjects in + yes) BASELIBS=$LIBS;; + *) LOCALLIBS=$LIBS;; + esac + LIBS='$(LOCALMODLIBS) $(BASEMODLIBS)' + DEFS="BASEMODLIBS=$BASELIBS$NL$DEFS" + DEFS="LOCALMODLIBS=$LOCALLIBS$NL$DEFS" + + EXTDECLS= + INITBITS= + for mod in $MODS + do + EXTDECLS="${EXTDECLS}extern void init$mod(void);$NL" + INITBITS="${INITBITS} {\"$mod\", init$mod},$NL" + done + + + case $config in + -) ;; + *) sed -e " + 1i$NL/* Generated automatically from $config by makesetup. */ + /MARKER 1/i$NL$EXTDECLS + + /MARKER 2/i$NL$INITBITS + + " $config >config.c + ;; + esac + + case $makepre in + -) ;; + *) sedf="@sed.in.$$" + trap 'rm -f $sedf' 0 1 2 3 + echo "1i\\" >$sedf + str="# Generated automatically from $makepre by makesetup." + echo "$str" >>$sedf + echo "s%_MODOBJS_%$OBJS%" >>$sedf + echo "s%_MODLIBS_%$LIBS%" >>$sedf + echo "/Definitions added by makesetup/a$NL$NL$DEFS" >>$sedf + sed -f $sedf $makepre >Makefile + cat $rulesf >>Makefile + rm -f $sedf + ;; + esac + + rm -f $rulesf +) From python-checkins at python.org Fri May 5 20:00:16 2006 From: python-checkins at python.org (richard.tew) Date: Fri, 5 May 2006 20:00:16 +0200 (CEST) Subject: [Python-checkins] r45912 - stackless/Python-2.4.3/dev/configure Message-ID: <20060505180016.389501E4017@bag.python.org> Author: richard.tew Date: Fri May 5 20:00:15 2006 New Revision: 45912 Modified: stackless/Python-2.4.3/dev/configure (props changed) Log: Made it executable. From python-checkins at python.org Fri May 5 20:42:14 2006 From: python-checkins at python.org (thomas.heller) Date: Fri, 5 May 2006 20:42:14 +0200 (CEST) Subject: [Python-checkins] r45913 - python/trunk/Modules/_ctypes/_ctypes_test.c Message-ID: <20060505184214.EF9F91E4008@bag.python.org> Author: thomas.heller Date: Fri May 5 20:42:14 2006 New Revision: 45913 Modified: python/trunk/Modules/_ctypes/_ctypes_test.c Log: Export the 'free' standard C function for use in the test suite. Modified: python/trunk/Modules/_ctypes/_ctypes_test.c ============================================================================== --- python/trunk/Modules/_ctypes/_ctypes_test.c (original) +++ python/trunk/Modules/_ctypes/_ctypes_test.c Fri May 5 20:42:14 2006 @@ -96,6 +96,11 @@ return dst; } +EXPORT(void) free(void *ptr) +{ + free(ptr); +} + #ifdef HAVE_WCHAR_H EXPORT(wchar_t *) my_wcsdup(wchar_t *src) { From python-checkins at python.org Fri May 5 20:43:24 2006 From: python-checkins at python.org (thomas.heller) Date: Fri, 5 May 2006 20:43:24 +0200 (CEST) Subject: [Python-checkins] r45914 - python/trunk/Lib/ctypes/test/test_slicing.py Message-ID: <20060505184324.EB7CD1E400C@bag.python.org> Author: thomas.heller Date: Fri May 5 20:43:24 2006 New Revision: 45914 Modified: python/trunk/Lib/ctypes/test/test_slicing.py Log: Fix memory leaks in the ctypes test suite, reported by valgrind, by free()ing the memory we allocate. Modified: python/trunk/Lib/ctypes/test/test_slicing.py ============================================================================== --- python/trunk/Lib/ctypes/test/test_slicing.py (original) +++ python/trunk/Lib/ctypes/test/test_slicing.py Fri May 5 20:43:24 2006 @@ -39,16 +39,19 @@ dll = CDLL(_ctypes_test.__file__) dll.my_strdup.restype = POINTER(c_char) + dll.my_free.restype = None res = dll.my_strdup(s) self.failUnlessEqual(res[:len(s)], s) import operator self.assertRaises(TypeError, operator.setslice, res, 0, 5, u"abcde") + dll.free(res) dll.my_strdup.restype = POINTER(c_byte) res = dll.my_strdup(s) self.failUnlessEqual(res[:len(s)-1], range(ord("a"), ord("z")+1)) + dll.free(res) def test_char_array(self): s = "abcdefghijklmnopqrstuvwxyz\0" @@ -68,12 +71,14 @@ dll = CDLL(_ctypes_test.__file__) dll.my_wcsdup.restype = POINTER(c_wchar) dll.my_wcsdup.argtypes = POINTER(c_wchar), + dll.my_free.restype = None res = dll.my_wcsdup(s) self.failUnlessEqual(res[:len(s)], s) import operator self.assertRaises(TypeError, operator.setslice, res, 0, 5, u"abcde") + dll.free(res) if sizeof(c_wchar) == sizeof(c_short): dll.my_wcsdup.restype = POINTER(c_short) @@ -81,8 +86,11 @@ dll.my_wcsdup.restype = POINTER(c_int) elif sizeof(c_wchar) == sizeof(c_long): dll.my_wcsdup.restype = POINTER(c_long) + else: + return res = dll.my_wcsdup(s) self.failUnlessEqual(res[:len(s)-1], range(ord("a"), ord("z")+1)) + dll.free(res) ################################################################ From python-checkins at python.org Fri May 5 20:46:28 2006 From: python-checkins at python.org (thomas.heller) Date: Fri, 5 May 2006 20:46:28 +0200 (CEST) Subject: [Python-checkins] r45915 - python/trunk/Lib/ctypes/test/test_slicing.py Message-ID: <20060505184628.5ED141E400C@bag.python.org> Author: thomas.heller Date: Fri May 5 20:46:27 2006 New Revision: 45915 Modified: python/trunk/Lib/ctypes/test/test_slicing.py Log: oops - the function is exported as 'my_free', not 'free'. Modified: python/trunk/Lib/ctypes/test/test_slicing.py ============================================================================== --- python/trunk/Lib/ctypes/test/test_slicing.py (original) +++ python/trunk/Lib/ctypes/test/test_slicing.py Fri May 5 20:46:27 2006 @@ -46,12 +46,12 @@ import operator self.assertRaises(TypeError, operator.setslice, res, 0, 5, u"abcde") - dll.free(res) + dll.my_free(res) dll.my_strdup.restype = POINTER(c_byte) res = dll.my_strdup(s) self.failUnlessEqual(res[:len(s)-1], range(ord("a"), ord("z")+1)) - dll.free(res) + dll.my_free(res) def test_char_array(self): s = "abcdefghijklmnopqrstuvwxyz\0" @@ -78,7 +78,7 @@ import operator self.assertRaises(TypeError, operator.setslice, res, 0, 5, u"abcde") - dll.free(res) + dll.my_free(res) if sizeof(c_wchar) == sizeof(c_short): dll.my_wcsdup.restype = POINTER(c_short) @@ -90,7 +90,7 @@ return res = dll.my_wcsdup(s) self.failUnlessEqual(res[:len(s)-1], range(ord("a"), ord("z")+1)) - dll.free(res) + dll.my_free(res) ################################################################ From python-checkins at python.org Fri May 5 21:14:24 2006 From: python-checkins at python.org (thomas.heller) Date: Fri, 5 May 2006 21:14:24 +0200 (CEST) Subject: [Python-checkins] r45916 - python/trunk/Modules/_ctypes/_ctypes_test.c Message-ID: <20060505191424.CD2C41E400B@bag.python.org> Author: thomas.heller Date: Fri May 5 21:14:24 2006 New Revision: 45916 Modified: python/trunk/Modules/_ctypes/_ctypes_test.c Log: Clean up. Modified: python/trunk/Modules/_ctypes/_ctypes_test.c ============================================================================== --- python/trunk/Modules/_ctypes/_ctypes_test.c (original) +++ python/trunk/Modules/_ctypes/_ctypes_test.c Fri May 5 21:14:24 2006 @@ -96,7 +96,7 @@ return dst; } -EXPORT(void) free(void *ptr) +EXPORT(void)my_free(void *ptr) { free(ptr); } @@ -204,11 +204,6 @@ return 0; } -EXPORT(void) my_free(void *p) -{ - printf("my_free got %p\n", p); -} - typedef struct { char *name; char *value; From python-checkins at python.org Fri May 5 21:26:02 2006 From: python-checkins at python.org (richard.tew) Date: Fri, 5 May 2006 21:26:02 +0200 (CEST) Subject: [Python-checkins] r45917 - stackless/Python-2.4.3/dev/Lib/test/output/test_MimeWriter stackless/Python-2.4.3/dev/Lib/test/output/test_asynchat stackless/Python-2.4.3/dev/Lib/test/output/test_augassign stackless/Python-2.4.3/dev/Lib/test/output/test_cgi stackless/Python-2.4.3/dev/Lib/test/output/test_class stackless/Python-2.4.3/dev/Lib/test/output/test_coercion stackless/Python-2.4.3/dev/Lib/test/output/test_compare stackless/Python-2.4.3/dev/Lib/test/output/test_cookie stackless/Python-2.4.3/dev/Lib/test/output/test_exceptions stackless/Python-2.4.3/dev/Lib/test/output/test_extcall stackless/Python-2.4.3/dev/Lib/test/output/test_frozen stackless/Python-2.4.3/dev/Lib/test/output/test_global stackless/Python-2.4.3/dev/Lib/test/output/test_grammar stackless/Python-2.4.3/dev/Lib/test/output/test_httplib stackless/Python-2.4.3/dev/Lib/test/output/test_linuxaudiodev stackless/Python-2.4.3/dev/Lib/test/output/test_logging stackless/Python-2.4.3/dev/Lib/test/output/test_math stackless/Python-2.4.3/dev/Lib/test/output/test_mmap stackless/Python-2.4.3/dev/Lib/test/output/test_new stackless/Python-2.4.3/dev/Lib/test/output/test_nis stackless/Python-2.4.3/dev/Lib/test/output/test_opcodes stackless/Python-2.4.3/dev/Lib/test/output/test_openpty stackless/Python-2.4.3/dev/Lib/test/output/test_operations stackless/Python-2.4.3/dev/Lib/test/output/test_ossaudiodev stackless/Python-2.4.3/dev/Lib/test/output/test_pep277 stackless/Python-2.4.3/dev/Lib/test/output/test_pkg stackless/Python-2.4.3/dev/Lib/test/output/test_poll stackless/Python-2.4.3/dev/Lib/test/output/test_popen stackless/Python-2.4.3/dev/Lib/test/output/test_popen2 stackless/Python-2.4.3/dev/Lib/test/output/test_profile stackless/Python-2.4.3/dev/Lib/test/output/test_pty stackless/Python-2.4.3/dev/Lib/test/output/test_pyexpat stackless/Python-2.4.3/dev/Lib/test/output/test_regex stackless/Python-2.4.3/dev/Lib/test/output/test_resource stackless/Python-2.4.3/dev/Lib/test/output/test_rgbimg stackless/Python-2.4.3/dev/Lib/test/output/test_scope stackless/Python-2.4.3/dev/Lib/test/output/test_signal stackless/Python-2.4.3/dev/Lib/test/output/test_thread stackless/Python-2.4.3/dev/Lib/test/output/test_threadedtempfile stackless/Python-2.4.3/dev/Lib/test/output/test_tokenize stackless/Python-2.4.3/dev/Lib/test/output/test_types stackless/Python-2.4.3/dev/Lib/test/output/test_winreg stackless/Python-2.4.3/dev/Lib/test/output/xmltests Message-ID: <20060505192602.6ECE11E401A@bag.python.org> Author: richard.tew Date: Fri May 5 21:25:58 2006 New Revision: 45917 Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_MimeWriter (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_asynchat (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_augassign (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_cgi (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_class (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_coercion (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_compare (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_cookie (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_exceptions (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_extcall (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_frozen (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_global (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_grammar (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_httplib (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_linuxaudiodev (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_logging (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_math (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_mmap (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_new (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_nis (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_opcodes (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_openpty (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_operations (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_ossaudiodev (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_pep277 (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_pkg (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_poll (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_popen (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_popen2 (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_profile (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_pty (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_pyexpat (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_regex (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_resource (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_rgbimg (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_scope (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_signal (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_thread (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_threadedtempfile (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_tokenize (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_types (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/test_winreg (contents, props changed) stackless/Python-2.4.3/dev/Lib/test/output/xmltests (contents, props changed) Log: Fixed up SVN properties for Python test output files. Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_MimeWriter ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_MimeWriter (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_MimeWriter Fri May 5 21:25:58 2006 @@ -1,110 +1,110 @@ -test_MimeWriter -From: bwarsaw at cnri.reston.va.us -Date: Mon Feb 12 17:21:48 EST 1996 -To: kss-submit at cnri.reston.va.us -MIME-Version: 1.0 -Content-Type: multipart/knowbot; - boundary="801spam999"; - version="0.1" - -This is a multi-part message in MIME format. - ---801spam999 -Content-Type: multipart/knowbot-metadata; - boundary="802spam999" - - ---802spam999 -Content-Type: message/rfc822 -KP-Metadata-Type: simple -KP-Access: read-only - -KPMD-Interpreter: python -KPMD-Interpreter-Version: 1.3 -KPMD-Owner-Name: Barry Warsaw -KPMD-Owner-Rendezvous: bwarsaw at cnri.reston.va.us -KPMD-Home-KSS: kss.cnri.reston.va.us -KPMD-Identifier: hdl://cnri.kss/my_first_knowbot -KPMD-Launch-Date: Mon Feb 12 16:39:03 EST 1996 - ---802spam999 -Content-Type: text/isl -KP-Metadata-Type: complex -KP-Metadata-Key: connection -KP-Access: read-only -KP-Connection-Description: Barry's Big Bass Business -KP-Connection-Id: B4 -KP-Connection-Direction: client - -INTERFACE Seller-1; - -TYPE Seller = OBJECT - DOCUMENTATION "A simple Seller interface to test ILU" - METHODS - price():INTEGER, - END; - ---802spam999 -Content-Type: message/external-body; - access-type="URL"; - URL="hdl://cnri.kss/generic-knowbot" - -Content-Type: text/isl -KP-Metadata-Type: complex -KP-Metadata-Key: generic-interface -KP-Access: read-only -KP-Connection-Description: Generic Interface for All Knowbots -KP-Connection-Id: generic-kp -KP-Connection-Direction: client - - ---802spam999-- - ---801spam999 -Content-Type: multipart/knowbot-code; - boundary="803spam999" - - ---803spam999 -Content-Type: text/plain -KP-Module-Name: BuyerKP - -class Buyer: - def __setup__(self, maxprice): - self._maxprice = maxprice - - def __main__(self, kos): - """Entry point upon arrival at a new KOS.""" - broker = kos.broker() - # B4 == Barry's Big Bass Business :-) - seller = broker.lookup('Seller_1.Seller', 'B4') - if seller: - price = seller.price() - print 'Seller wants $', price, '... ' - if price > self._maxprice: - print 'too much!' - else: - print "I'll take it!" - else: - print 'no seller found here' - ---803spam999-- - ---801spam999 -Content-Type: multipart/knowbot-state; - boundary="804spam999" -KP-Main-Module: main - - ---804spam999 -Content-Type: text/plain -KP-Module-Name: main - -# instantiate a buyer instance and put it in a magic place for the KOS -# to find. -__kp__ = Buyer() -__kp__.__setup__(500) - ---804spam999-- - ---801spam999-- +test_MimeWriter +From: bwarsaw at cnri.reston.va.us +Date: Mon Feb 12 17:21:48 EST 1996 +To: kss-submit at cnri.reston.va.us +MIME-Version: 1.0 +Content-Type: multipart/knowbot; + boundary="801spam999"; + version="0.1" + +This is a multi-part message in MIME format. + +--801spam999 +Content-Type: multipart/knowbot-metadata; + boundary="802spam999" + + +--802spam999 +Content-Type: message/rfc822 +KP-Metadata-Type: simple +KP-Access: read-only + +KPMD-Interpreter: python +KPMD-Interpreter-Version: 1.3 +KPMD-Owner-Name: Barry Warsaw +KPMD-Owner-Rendezvous: bwarsaw at cnri.reston.va.us +KPMD-Home-KSS: kss.cnri.reston.va.us +KPMD-Identifier: hdl://cnri.kss/my_first_knowbot +KPMD-Launch-Date: Mon Feb 12 16:39:03 EST 1996 + +--802spam999 +Content-Type: text/isl +KP-Metadata-Type: complex +KP-Metadata-Key: connection +KP-Access: read-only +KP-Connection-Description: Barry's Big Bass Business +KP-Connection-Id: B4 +KP-Connection-Direction: client + +INTERFACE Seller-1; + +TYPE Seller = OBJECT + DOCUMENTATION "A simple Seller interface to test ILU" + METHODS + price():INTEGER, + END; + +--802spam999 +Content-Type: message/external-body; + access-type="URL"; + URL="hdl://cnri.kss/generic-knowbot" + +Content-Type: text/isl +KP-Metadata-Type: complex +KP-Metadata-Key: generic-interface +KP-Access: read-only +KP-Connection-Description: Generic Interface for All Knowbots +KP-Connection-Id: generic-kp +KP-Connection-Direction: client + + +--802spam999-- + +--801spam999 +Content-Type: multipart/knowbot-code; + boundary="803spam999" + + +--803spam999 +Content-Type: text/plain +KP-Module-Name: BuyerKP + +class Buyer: + def __setup__(self, maxprice): + self._maxprice = maxprice + + def __main__(self, kos): + """Entry point upon arrival at a new KOS.""" + broker = kos.broker() + # B4 == Barry's Big Bass Business :-) + seller = broker.lookup('Seller_1.Seller', 'B4') + if seller: + price = seller.price() + print 'Seller wants $', price, '... ' + if price > self._maxprice: + print 'too much!' + else: + print "I'll take it!" + else: + print 'no seller found here' + +--803spam999-- + +--801spam999 +Content-Type: multipart/knowbot-state; + boundary="804spam999" +KP-Main-Module: main + + +--804spam999 +Content-Type: text/plain +KP-Module-Name: main + +# instantiate a buyer instance and put it in a magic place for the KOS +# to find. +__kp__ = Buyer() +__kp__.__setup__(500) + +--804spam999-- + +--801spam999-- Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_asynchat ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_asynchat (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_asynchat Fri May 5 21:25:58 2006 @@ -1,3 +1,3 @@ -test_asynchat -Connected -Received: 'hello world' +test_asynchat +Connected +Received: 'hello world' Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_augassign ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_augassign (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_augassign Fri May 5 21:25:58 2006 @@ -1,51 +1,51 @@ -test_augassign -6 -[6] -6 -[1, 2, 3, 4, 1, 2, 3, 4] -[1, 2, 1, 2, 3] -True -True -True -11 -True -12 -True -True -13 -__add__ called -__radd__ called -__iadd__ called -__sub__ called -__rsub__ called -__isub__ called -__mul__ called -__rmul__ called -__imul__ called -__div__ called -__rdiv__ called -__idiv__ called -__floordiv__ called -__rfloordiv__ called -__ifloordiv__ called -__mod__ called -__rmod__ called -__imod__ called -__pow__ called -__rpow__ called -__ipow__ called -__or__ called -__ror__ called -__ior__ called -__and__ called -__rand__ called -__iand__ called -__xor__ called -__rxor__ called -__ixor__ called -__rshift__ called -__rrshift__ called -__irshift__ called -__lshift__ called -__rlshift__ called -__ilshift__ called +test_augassign +6 +[6] +6 +[1, 2, 3, 4, 1, 2, 3, 4] +[1, 2, 1, 2, 3] +True +True +True +11 +True +12 +True +True +13 +__add__ called +__radd__ called +__iadd__ called +__sub__ called +__rsub__ called +__isub__ called +__mul__ called +__rmul__ called +__imul__ called +__div__ called +__rdiv__ called +__idiv__ called +__floordiv__ called +__rfloordiv__ called +__ifloordiv__ called +__mod__ called +__rmod__ called +__imod__ called +__pow__ called +__rpow__ called +__ipow__ called +__or__ called +__ror__ called +__ior__ called +__and__ called +__rand__ called +__iand__ called +__xor__ called +__rxor__ called +__ixor__ called +__rshift__ called +__rrshift__ called +__irshift__ called +__lshift__ called +__rlshift__ called +__ilshift__ called Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_cgi ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_cgi (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_cgi Fri May 5 21:25:58 2006 @@ -1,40 +1,40 @@ -test_cgi -'' => [] -'&' => [] -'&&' => [] -'=' => [('', '')] -'=a' => [('', 'a')] -'a' => [('a', '')] -'a=' => [('a', '')] -'a=' => [('a', '')] -'&a=b' => [('a', 'b')] -'a=a+b&b=b+c' => [('a', 'a b'), ('b', 'b c')] -'a=1&a=2' => [('a', '1'), ('a', '2')] -'' -'&' -'&&' -';' -';&;' -'=' -'=&=' -'=;=' -'=a' -'&=a' -'=a&' -'=&a' -'b=a' -'b+=a' -'a=b=a' -'a=+b=a' -'&b=a' -'b&=a' -'a=a+b&b=b+c' -'a=a+b&a=b+a' -'x=1&y=2.0&z=2-3.%2b0' -'x=1;y=2.0&z=2-3.%2b0' -'x=1;y=2.0;z=2-3.%2b0' -'Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env' -'group_id=5470&set=custom&_assigned_to=31392&_status=1&_category=100&SUBMIT=Browse' -Testing log -Testing initlog 1 -Testing log 2 +test_cgi +'' => [] +'&' => [] +'&&' => [] +'=' => [('', '')] +'=a' => [('', 'a')] +'a' => [('a', '')] +'a=' => [('a', '')] +'a=' => [('a', '')] +'&a=b' => [('a', 'b')] +'a=a+b&b=b+c' => [('a', 'a b'), ('b', 'b c')] +'a=1&a=2' => [('a', '1'), ('a', '2')] +'' +'&' +'&&' +';' +';&;' +'=' +'=&=' +'=;=' +'=a' +'&=a' +'=a&' +'=&a' +'b=a' +'b+=a' +'a=b=a' +'a=+b=a' +'&b=a' +'b&=a' +'a=a+b&b=b+c' +'a=a+b&a=b+a' +'x=1&y=2.0&z=2-3.%2b0' +'x=1;y=2.0&z=2-3.%2b0' +'x=1;y=2.0;z=2-3.%2b0' +'Hbc5161168c542333633315dee1182227:key_store_seqid=400006&cuyer=r&view=bustomer&order_id=0bb2e248638833d48cb7fed300000f1b&expire=964546263&lobale=en-US&kid=130003.300038&ss=env' +'group_id=5470&set=custom&_assigned_to=31392&_status=1&_category=100&SUBMIT=Browse' +Testing log +Testing initlog 1 +Testing log 2 Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_class ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_class (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_class Fri May 5 21:25:58 2006 @@ -1,101 +1,101 @@ -test_class -__init__: () -__coerce__: (1,) -__add__: (1,) -__coerce__: (1,) -__radd__: (1,) -__coerce__: (1,) -__sub__: (1,) -__coerce__: (1,) -__rsub__: (1,) -__coerce__: (1,) -__mul__: (1,) -__coerce__: (1,) -__rmul__: (1,) -__coerce__: (1,) -__div__: (1,) -__coerce__: (1,) -__rdiv__: (1,) -__coerce__: (1,) -__mod__: (1,) -__coerce__: (1,) -__rmod__: (1,) -__coerce__: (1,) -__divmod__: (1,) -__coerce__: (1,) -__rdivmod__: (1,) -__coerce__: (1,) -__pow__: (1,) -__coerce__: (1,) -__rpow__: (1,) -__coerce__: (1,) -__rshift__: (1,) -__coerce__: (1,) -__rrshift__: (1,) -__coerce__: (1,) -__lshift__: (1,) -__coerce__: (1,) -__rlshift__: (1,) -__coerce__: (1,) -__and__: (1,) -__coerce__: (1,) -__rand__: (1,) -__coerce__: (1,) -__or__: (1,) -__coerce__: (1,) -__ror__: (1,) -__coerce__: (1,) -__xor__: (1,) -__coerce__: (1,) -__rxor__: (1,) -__contains__: (1,) -__getitem__: (1,) -__setitem__: (1, 1) -__delitem__: (1,) -__getslice__: (0, 42) -__setslice__: (0, 42, 'The Answer') -__delslice__: (0, 42) -__getitem__: (slice(2, 1024, 10),) -__setitem__: (slice(2, 1024, 10), 'A lot') -__delitem__: (slice(2, 1024, 10),) -__getitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100),) -__setitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100), 'Strange') -__delitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100),) -__getitem__: (slice(0, 42, None),) -__setitem__: (slice(0, 42, None), 'The Answer') -__delitem__: (slice(0, 42, None),) -__neg__: () -__pos__: () -__abs__: () -__int__: () -__long__: () -__float__: () -__oct__: () -__hex__: () -__hash__: () -__repr__: () -__str__: () -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__coerce__: (1,) -__cmp__: (1,) -__del__: () -__getattr__: ('spam',) -__setattr__: ('eggs', 'spam, spam, spam and ham') -__delattr__: ('cardinal',) +test_class +__init__: () +__coerce__: (1,) +__add__: (1,) +__coerce__: (1,) +__radd__: (1,) +__coerce__: (1,) +__sub__: (1,) +__coerce__: (1,) +__rsub__: (1,) +__coerce__: (1,) +__mul__: (1,) +__coerce__: (1,) +__rmul__: (1,) +__coerce__: (1,) +__div__: (1,) +__coerce__: (1,) +__rdiv__: (1,) +__coerce__: (1,) +__mod__: (1,) +__coerce__: (1,) +__rmod__: (1,) +__coerce__: (1,) +__divmod__: (1,) +__coerce__: (1,) +__rdivmod__: (1,) +__coerce__: (1,) +__pow__: (1,) +__coerce__: (1,) +__rpow__: (1,) +__coerce__: (1,) +__rshift__: (1,) +__coerce__: (1,) +__rrshift__: (1,) +__coerce__: (1,) +__lshift__: (1,) +__coerce__: (1,) +__rlshift__: (1,) +__coerce__: (1,) +__and__: (1,) +__coerce__: (1,) +__rand__: (1,) +__coerce__: (1,) +__or__: (1,) +__coerce__: (1,) +__ror__: (1,) +__coerce__: (1,) +__xor__: (1,) +__coerce__: (1,) +__rxor__: (1,) +__contains__: (1,) +__getitem__: (1,) +__setitem__: (1, 1) +__delitem__: (1,) +__getslice__: (0, 42) +__setslice__: (0, 42, 'The Answer') +__delslice__: (0, 42) +__getitem__: (slice(2, 1024, 10),) +__setitem__: (slice(2, 1024, 10), 'A lot') +__delitem__: (slice(2, 1024, 10),) +__getitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100),) +__setitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100), 'Strange') +__delitem__: ((slice(None, 42, None), Ellipsis, slice(None, 24, None), 24, 100),) +__getitem__: (slice(0, 42, None),) +__setitem__: (slice(0, 42, None), 'The Answer') +__delitem__: (slice(0, 42, None),) +__neg__: () +__pos__: () +__abs__: () +__int__: () +__long__: () +__float__: () +__oct__: () +__hex__: () +__hash__: () +__repr__: () +__str__: () +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__coerce__: (1,) +__cmp__: (1,) +__del__: () +__getattr__: ('spam',) +__setattr__: ('eggs', 'spam, spam, spam and ham') +__delattr__: ('cardinal',) Modified: stackless/Python-2.4.3/dev/Lib/test/output/test_coercion ============================================================================== --- stackless/Python-2.4.3/dev/Lib/test/output/test_coercion (original) +++ stackless/Python-2.4.3/dev/Lib/test/output/test_coercion Fri May 5 21:25:58 2006 @@ -1,1054 +1,1054 @@ -test_coercion -2 + 2 = 4 -2 += 2 => 4 -2 - 2 = 0 -2 -= 2 => 0 -2 * 2 = 4 -2 *= 2 => 4 -2 / 2 = 1 -2 /= 2 => 1 -2 ** 2 = 4 -2 **= 2 => 4 -2 % 2 = 0 -2 %= 2 => 0 -2 + 4.0 = 6.0 -2 += 4.0 => 6.0 -2 - 4.0 = -2.0 -2 -= 4.0 => -2.0 -2 * 4.0 = 8.0 -2 *= 4.0 => 8.0 -2 / 4.0 = 0.5 -2 /= 4.0 => 0.5 -2 ** 4.0 = 16.0 -2 **= 4.0 => 16.0 -2 % 4.0 = 2.0 -2 %= 4.0 => 2.0 -2 + 2 = 4 -2 += 2 => 4 -2 - 2 = 0 -2 -= 2 => 0 -2 * 2 = 4 -2 *= 2 => 4 -2 / 2 = 1 -2 /= 2 => 1 -2 ** 2 = 4 -2 **= 2 => 4 -2 % 2 = 0 -2 %= 2 => 0 -2 + (2+0j) = (4.0 + 0.0j) -2 += (2+0j) => (4.0 + 0.0j) -2 - (2+0j) = (0.0 + 0.0j) -2 -= (2+0j) => (0.0 + 0.0j) -2 * (2+0j) = (4.0 + 0.0j) -2 *= (2+0j) => (4.0 + 0.0j) -2 / (2+0j) = (1.0 + 0.0j) -2 /= (2+0j) => (1.0 + 0.0j) -2 ** (2+0j) = (4.0 + 0.0j) -2 **= (2+0j) => (4.0 + 0.0j) -2 % (2+0j) = (0.0 + 0.0j) -2 %= (2+0j) => (0.0 + 0.0j) -2 + [1] ... exceptions.TypeError -2 += [1] ... exceptions.TypeError -2 - [1] ... exceptions.TypeError -2 -= [1] ... exceptions.TypeError -2 * [1] = [1, 1] -2 *= [1] => [1, 1] -2 / [1] ... exceptions.TypeError -2 /= [1] ... exceptions.TypeError -2 ** [1] ... exceptions.TypeError -2 **= [1] ... exceptions.TypeError -2 % [1] ... exceptions.TypeError -2 %= [1] ... exceptions.TypeError -2 + (2,) ... exceptions.TypeError -2 += (2,) ... exceptions.TypeError -2 - (2,) ... exceptions.TypeError -2 -= (2,) ... exceptions.TypeError -2 * (2,) = (2, 2) -2 *= (2,) => (2, 2) -2 / (2,) ... exceptions.TypeError -2 /= (2,) ... exceptions.TypeError -2 ** (2,) ... exceptions.TypeError -2 **= (2,) ... exceptions.TypeError -2 % (2,) ... exceptions.TypeError -2 %= (2,) ... exceptions.TypeError -2 + None ... exceptions.TypeError -2 += None ... exceptions.TypeError -2 - None ... exceptions.TypeError -2 -= None ... exceptions.TypeError -2 * None ... exceptions.TypeError -2 *= None ... exceptions.TypeError -2 / None ... exceptions.TypeError -2 /= None ... exceptions.TypeError -2 ** None ... exceptions.TypeError -2 **= None ... exceptions.TypeError -2 % None ... exceptions.TypeError -2 %= None ... exceptions.TypeError -2 + = 4 -2 += => 4 -2 - = 0 -2 -= => 0 -2 * = 4 -2 *= => 4 -2 / = 1 -2 /= => 1 -2 ** = 4 -2 **= => 4 -2 % = 0 -2 %= => 0 -2 + = 4 -2 += => 4 -2 - = 0 -2 -= => 0 -2 * = 4 -2 *= => 4 -2 / = 1 -2 /= => 1 -2 ** = 4 -2 **= => 4 -2 % = 0 -2 %= => 0 -4.0 + 2 = 6.0 -4.0 += 2 => 6.0 -4.0 - 2 = 2.0 -4.0 -= 2 => 2.0 -4.0 * 2 = 8.0 -4.0 *= 2 => 8.0 -4.0 / 2 = 2.0 -4.0 /= 2 => 2.0 -4.0 ** 2 = 16.0 -4.0 **= 2 => 16.0 -4.0 % 2 = 0.0 -4.0 %= 2 => 0.0 -4.0 + 4.0 = 8.0 -4.0 += 4.0 => 8.0 -4.0 - 4.0 = 0.0 -4.0 -= 4.0 => 0.0 -4.0 * 4.0 = 16.0 -4.0 *= 4.0 => 16.0 -4.0 / 4.0 = 1.0 -4.0 /= 4.0 => 1.0 -4.0 ** 4.0 = 256.0 -4.0 **= 4.0 => 256.0 -4.0 % 4.0 = 0.0 -4.0 %= 4.0 => 0.0 -4.0 + 2 = 6.0 -4.0 += 2 => 6.0 -4.0 - 2 = 2.0 -4.0 -= 2 => 2.0 -4.0 * 2 = 8.0 -4.0 *= 2 => 8.0 -4.0 / 2 = 2.0 -4.0 /= 2 => 2.0 -4.0 ** 2 = 16.0 -4.0 **= 2 => 16.0 -4.0 % 2 = 0.0 -4.0 %= 2 => 0.0 -4.0 + (2+0j) = (6.0 + 0.0j) -4.0 += (2+0j) => (6.0 + 0.0j) -4.0 - (2+0j) = (2.0 + 0.0j) -4.0 -= (2+0j) => (2.0 + 0.0j) -4.0 * (2+0j) = (8.0 + 0.0j) -4.0 *= (2+0j) => (8.0 + 0.0j) -4.0 / (2+0j) = (2.0 + 0.0j) -4.0 /= (2+0j) => (2.0 + 0.0j) -4.0 ** (2+0j) = (16.0 + 0.0j) -4.0 **= (2+0j) => (16.0 + 0.0j) -4.0 % (2+0j) = (0.0 + 0.0j) -4.0 %= (2+0j) => (0.0 + 0.0j) -4.0 + [1] ... exceptions.TypeError -4.0 += [1] ... exceptions.TypeError -4.0 - [1] ... exceptions.TypeError -4.0 -= [1] ... exceptions.TypeError -4.0 * [1] ... exceptions.TypeError -4.0 *= [1] ... exceptions.TypeError -4.0 / [1] ... exceptions.TypeError -4.0 /= [1] ... exceptions.TypeError -4.0 ** [1] ... exceptions.TypeError -4.0 **= [1] ... exceptions.TypeError -4.0 % [1] ... exceptions.TypeError -4.0 %= [1] ... exceptions.TypeError -4.0 + (2,) ... exceptions.TypeError -4.0 += (2,) ... exceptions.TypeError -4.0 - (2,) ... exceptions.TypeError -4.0 -= (2,) ... exceptions.TypeError -4.0 * (2,) ... exceptions.TypeError -4.0 *= (2,) ... exceptions.TypeError -4.0 / (2,) ... exceptions.TypeError -4.0 /= (2,) ... exceptions.TypeError -4.0 ** (2,) ... exceptions.TypeError -4.0 **= (2,) ... exceptions.TypeError -4.0 % (2,) ... exceptions.TypeError -4.0 %= (2,) ... exceptions.TypeError -4.0 + None ... exceptions.TypeError -4.0 += None ... exceptions.TypeError -4.0 - None ... exceptions.TypeError -4.0 -= None ... exceptions.TypeError -4.0 * None ... exceptions.TypeError -4.0 *= None ... exceptions.TypeError -4.0 / None ... exceptions.TypeError -4.0 /= None ... exceptions.TypeError -4.0 ** None ... exceptions.TypeError -4.0 **= None ... exceptions.TypeError -4.0 % None ... exceptions.TypeError -4.0 %= None ... exceptions.TypeError -4.0 + = 6.0 -4.0 += => 6.0 -4.0 - = 2.0 -4.0 -= => 2.0 -4.0 * = 8.0 -4.0 *= => 8.0 -4.0 / = 2.0 -4.0 /= => 2.0 -4.0 ** = 16.0 -4.0 **= => 16.0 -4.0 % = 0.0 -4.0 %= => 0.0 -4.0 + = 6.0 -4.0 += => 6.0 -4.0 - = 2.0 -4.0 -= => 2.0 -4.0 * = 8.0 -4.0 *= => 8.0 -4.0 / = 2.0 -4.0 /= => 2.0 -4.0 ** = 16.0 -4.0 **= => 16.0 -4.0 % = 0.0 -4.0 %= => 0.0 -2 + 2 = 4 -2 += 2 => 4 -2 - 2 = 0 -2 -= 2 => 0 -2 * 2 = 4 -2 *= 2 => 4 -2 / 2 = 1 -2 /= 2 => 1 -2 ** 2 = 4 -2 **= 2 => 4 -2 % 2 = 0 -2 %= 2 => 0 -2 + 4.0 = 6.0 -2 += 4.0 => 6.0 -2 - 4.0 = -2.0 -2 -= 4.0 => -2.0 -2 * 4.0 = 8.0 -2 *= 4.0 => 8.0 -2 / 4.0 = 0.5 -2 /= 4.0 => 0.5 -2 ** 4.0 = 16.0 -2 **= 4.0 => 16.0 -2 % 4.0 = 2.0 -2 %= 4.0 => 2.0 -2 + 2 = 4 -2 += 2 => 4 -2 - 2 = 0 -2 -= 2 => 0 -2 * 2 = 4 -2 *= 2 => 4 -2 / 2 = 1 -2 /= 2 => 1 -2 ** 2 = 4 -2 **= 2 => 4 -2 % 2 = 0 -2 %= 2 => 0 -2 + (2+0j) = (4.0 + 0.0j) -2 += (2+0j) => (4.0 + 0.0j) -2 - (2+0j) = (0.0 + 0.0j) -2 -= (2+0j) => (0.0 + 0.0j) -2 * (2+0j) = (4.0 + 0.0j) -2 *= (2+0j) => (4.0 + 0.0j) -2 / (2+0j) = (1.0 + 0.0j) -2 /= (2+0j) => (1.0 + 0.0j) -2 ** (2+0j) = (4.0 + 0.0j) -2 **= (2+0j) => (4.0 + 0.0j) -2 % (2+0j) = (0.0 + 0.0j) -2 %= (2+0j) => (0.0 + 0.0j) -2 + [1] ... exceptions.TypeError -2 += [1] ... exceptions.TypeError -2 - [1] ... exceptions.TypeError -2 -= [1] ... exceptions.TypeError -2 * [1] = [1, 1] -2 *= [1] => [1, 1] -2 / [1] ... exceptions.TypeError -2 /= [1] ... exceptions.TypeError -2 ** [1] ... exceptions.TypeError -2 **= [1] ... exceptions.TypeError -2 % [1] ... exceptions.TypeError -2 %= [1] ... exceptions.TypeError -2 + (2,) ... exceptions.TypeError -2 += (2,) ... exceptions.TypeError -2 - (2,) ... exceptions.TypeError -2 -= (2,) ... exceptions.TypeError -2 * (2,) = (2, 2) -2 *= (2,) => (2, 2) -2 / (2,) ... exceptions.TypeError -2 /= (2,) ... exceptions.TypeError -2 ** (2,) ... exceptions.TypeError -2 **= (2,) ... exceptions.TypeError -2 % (2,) ... exceptions.TypeError -2 %= (2,) ... exceptions.TypeError -2 + None ... exceptions.TypeError -2 += None ... exceptions.TypeError -2 - None ... exceptions.TypeError -2 -= None ... exceptions.TypeError -2 * None ... exceptions.TypeError -2 *= None ... exceptions.TypeError -2 / None ... exceptions.TypeError -2 /= None ... exceptions.TypeError -2 ** None ... exceptions.TypeError -2 **= None ... exceptions.TypeError -2 % None ... exceptions.TypeError -2 %= None ... exceptions.TypeError -2 + = 4 -2 += => 4 -2 - = 0 -2 -= => 0 -2 * = 4 -2 *= => 4 -2 / = 1 -2 /= => 1 -2 ** = 4 -2 **= => 4 -2 % = 0 -2 %= => 0 -2 + = 4 -2 += => 4 -2 - = 0 -2 -= => 0 -2 * = 4 -2 *= => 4 -2 / = 1 -2 /= => 1 -2 ** = 4 -2 **= => 4 -2 % = 0 -2 %= => 0 -(2+0j) + 2 = (4.0 + 0.0j) -(2+0j) += 2 => (4.0 + 0.0j) -(2+0j) - 2 = (0.0 + 0.0j) -(2+0j) -= 2 => (0.0 + 0.0j) -(2+0j) * 2 = (4.0 + 0.0j) -(2+0j) *= 2 => (4.0 + 0.0j) -(2+0j) / 2 = (1.0 + 0.0j) -(2+0j) /= 2 => (1.0 + 0.0j) -(2+0j) ** 2 = (4.0 + 0.0j) -(2+0j) **= 2 => (4.0 + 0.0j) -(2+0j) % 2 = (0.0 + 0.0j) -(2+0j) %= 2 => (0.0 + 0.0j) -(2+0j) + 4.0 = (6.0 + 0.0j) -(2+0j) += 4.0 => (6.0 + 0.0j) -(2+0j) - 4.0 = (-2.0 + 0.0j) -(2+0j) -= 4.0 => (-2.0 + 0.0j) -(2+0j) * 4.0 = (8.0 + 0.0j) -(2+0j) *= 4.0 => (8.0 + 0.0j) -(2+0j) / 4.0 = (0.5 + 0.0j) -(2+0j) /= 4.0 => (0.5 + 0.0j) -(2+0j) ** 4.0 = (16.0 + 0.0j) -(2+0j) **= 4.0 => (16.0 + 0.0j) -(2+0j) % 4.0 = (2.0 + 0.0j) -(2+0j) %= 4.0 => (2.0 + 0.0j) -(2+0j) + 2 = (4.0 + 0.0j) -(2+0j) += 2 => (4.0 + 0.0j) -(2+0j) - 2 = (0.0 + 0.0j) -(2+0j) -= 2 => (0.0 + 0.0j) -(2+0j) * 2 = (4.0 + 0.0j) -(2+0j) *= 2 => (4.0 + 0.0j) -(2+0j) / 2 = (1.0 + 0.0j) -(2+0j) /= 2 => (1.0 + 0.0j) -(2+0j) ** 2 = (4.0 + 0.0j) -(2+0j) **= 2 => (4.0 + 0.0j) -(2+0j) % 2 = (0.0 + 0.0j) -(2+0j) %= 2 => (0.0 + 0.0j) -(2+0j) + (2+0j) = (4.0 + 0.0j) -(2+0j) += (2+0j) => (4.0 + 0.0j) -(2+0j) - (2+0j) = (0.0 + 0.0j) -(2+0j) -= (2+0j) => (0.0 + 0.0j) -(2+0j) * (2+0j) = (4.0 + 0.0j) -(2+0j) *= (2+0j) => (4.0 + 0.0j) -(2+0j) / (2+0j) = (1.0 + 0.0j) -(2+0j) /= (2+0j) => (1.0 + 0.0j) -(2+0j) ** (2+0j) = (4.0 + 0.0j) -(2+0j) **= (2+0j) => (4.0 + 0.0j) -(2+0j) % (2+0j) = (0.0 + 0.0j) -(2+0j) %= (2+0j) => (0.0 + 0.0j) -(2+0j) + [1] ... exceptions.TypeError -(2+0j) += [1] ... exceptions.TypeError -(2+0j) - [1] ... exceptions.TypeError -(2+0j) -= [1] ... exceptions.TypeError -(2+0j) * [1] ... exceptions.TypeError -(2+0j) *= [1] ... exceptions.TypeError -(2+0j) / [1] ... exceptions.TypeError -(2+0j) /= [1] ... exceptions.TypeError -(2+0j) ** [1] ... exceptions.TypeError -(2+0j) **= [1] ... exceptions.TypeError -(2+0j) % [1] ... exceptions.TypeError -(2+0j) %= [1] ... exceptions.TypeError -(2+0j) + (2,) ... exceptions.TypeError -(2+0j) += (2,) ... exceptions.TypeError -(2+0j) - (2,) ... exceptions.TypeError -(2+0j) -= (2,) ... exceptions.TypeError -(2+0j) * (2,) ... exceptions.TypeError -(2+0j) *= (2,) ... exceptions.TypeError -(2+0j) / (2,) ... exceptions.TypeError -(2+0j) /= (2,) ... exceptions.TypeError -(2+0j) ** (2,) ... exceptions.TypeError -(2+0j) **= (2,) ... exceptions.TypeError -(2+0j) % (2,) ... exceptions.TypeError -(2+0j) %= (2,) ... exceptions.TypeError -(2+0j) + None ... exceptions.TypeError -(2+0j) += None ... exceptions.TypeError -(2+0j) - None ... exceptions.TypeError -(2+0j) -= None ... exceptions.TypeError -(2+0j) * None ... exceptions.TypeError -(2+0j) *= None ... exceptions.TypeError -(2+0j) / None ... exceptions.TypeError -(2+0j) /= None ... exceptions.TypeError -(2+0j) ** None ... exceptions.TypeError -(2+0j) **= None ... exceptions.TypeError -(2+0j) % None ... exceptions.TypeError -(2+0j) %= None ... exceptions.TypeError -(2+0j) + = (4.0 + 0.0j) -(2+0j) += => (4.0 + 0.0j) -(2+0j) - = (0.0 + 0.0j) -(2+0j) -= => (0.0 + 0.0j) -(2+0j) * = (4.0 + 0.0j) -(2+0j) *= => (4.0 + 0.0j) -(2+0j) / = (1.0 + 0.0j) -(2+0j) /= => (1.0 + 0.0j) -(2+0j) ** = (4.0 + 0.0j) -(2+0j) **= => (4.0 + 0.0j) -(2+0j) % = (0.0 + 0.0j) -(2+0j) %= => (0.0 + 0.0j) -(2+0j) + = (4.0 + 0.0j) -(2+0j) += => (4.0 + 0.0j) -(2+0j) - = (0.0 + 0.0j) -(2+0j) -= => (0.0 + 0.0j) -(2+0j) * = (4.0 + 0.0j) -(2+0j) *= => (4.0 + 0.0j) -(2+0j) / = (1.0 + 0.0j) -(2+0j) /= => (1.0 + 0.0j) -(2+0j) ** = (4.0 + 0.0j) -(2+0j) **= => (4.0 + 0.0j) -(2+0j) % = (0.0 + 0.0j) -(2+0j) %= => (0.0 + 0.0j) -[1] + 2 ... exceptions.TypeError -[1] += 2 ... exceptions.TypeError -[1] - 2 ... exceptions.TypeError -[1] -= 2 ... exceptions.TypeError -[1] * 2 = [1, 1] -[1] *= 2 => [1, 1] -[1] / 2 ... exceptions.TypeError -[1] /= 2 ... exceptions.TypeError -[1] ** 2 ... exceptions.TypeError -[1] **= 2 ... exceptions.TypeError -[1] % 2 ... exceptions.TypeError -[1] %= 2 ... exceptions.TypeError -[1] + 4.0 ... exceptions.TypeError -[1] += 4.0 ... exceptions.TypeError -[1] - 4.0 ... exceptions.TypeError -[1] -= 4.0 ... exceptions.TypeError -[1] * 4.0 ... exceptions.TypeError -[1] *= 4.0 ... exceptions.TypeError -[1] / 4.0 ... exceptions.TypeError -[1] /= 4.0 ... exceptions.TypeError -[1] ** 4.0 ... exceptions.TypeError -[1] **= 4.0 ... exceptions.TypeError -[1] % 4.0 ... exceptions.TypeError -[1] %= 4.0 ... exceptions.TypeError -[1] + 2 ... exceptions.TypeError -[1] += 2 ... exceptions.TypeError -[1] - 2 ... exceptions.TypeError -[1] -= 2 ... exceptions.TypeError -[1] * 2 = [1, 1] -[1] *= 2 => [1, 1] -[1] / 2 ... exceptions.TypeError -[1] /= 2 ... exceptions.TypeError -[1] ** 2 ... exceptions.TypeError -[1] **= 2 ... exceptions.TypeError -[1] % 2 ... exceptions.TypeError -[1] %= 2 ... exceptions.TypeError -[1] + (2+0j) ... exceptions.TypeError -[1] += (2+0j) ... exceptions.TypeError -[1] - (2+0j) ... exceptions.TypeError -[1] -= (2+0j) ... exceptions.TypeError -[1] * (2+0j) ... exceptions.TypeError -[1] *= (2+0j) ... exceptions.TypeError -[1] / (2+0j) ... exceptions.TypeError -[1] /= (2+0j) ... exceptions.TypeError -[1] ** (2+0j) ... exceptions.TypeError -[1] **= (2+0j) ... exceptions.TypeError -[1] % (2+0j) ... exceptions.TypeError -[1] %= (2+0j) ... exceptions.TypeError -[1] + [1] = [1, 1] -[1] += [1] => [1, 1] -[1] - [1] ... exceptions.TypeError -[1] -= [1] ... exceptions.TypeError -[1] * [1] ... exceptions.TypeError -[1] *= [1] ... exceptions.TypeError -[1] / [1] ... exceptions.TypeError -[1] /= [1] ... exceptions.TypeError -[1] ** [1] ... exceptions.TypeError -[1] **= [1] ... exceptions.TypeError -[1] % [1] ... exceptions.TypeError -[1] %= [1] ... exceptions.TypeError -[1] + (2,) ... exceptions.TypeError -[1] += (2,) => [1, 2] -[1] - (2,) ... exceptions.TypeError -[1] -= (2,) ... exceptions.TypeError -[1] * (2,) ... exceptions.TypeError -[1] *= (2,) ... exceptions.TypeError -[1] / (2,) ... exceptions.TypeError -[1] /= (2,) ... exceptions.TypeError -[1] ** (2,) ... exceptions.TypeError -[1] **= (2,) ... exceptions.TypeError -[1] % (2,) ... exceptions.TypeError -[1] %= (2,) ... exceptions.TypeError -[1] + None ... exceptions.TypeError -[1] += None ... exceptions.TypeError -[1] - None ... exceptions.TypeError -[1] -= None ... exceptions.TypeError -[1] * None ... exceptions.TypeError -[1] *= None ... exceptions.TypeError -[1] / None ... exceptions.TypeError -[1] /= None ... exceptions.TypeError -[1] ** None ... exceptions.TypeError -[1] **= None ... exceptions.TypeError -[1] % None ... exceptions.TypeError -[1] %= None ... exceptions.TypeError -[1] + ... exceptions.TypeError -[1] += ... exceptions.TypeError -[1] - ... exceptions.TypeError -[1] -= ... exceptions.TypeError -[1] * = [1, 1] -[1] *= => [1, 1] -[1] / ... exceptions.TypeError -[1] /= ... exceptions.TypeError -[1] ** ... exceptions.TypeError -[1] **= ... exceptions.TypeError -[1] % ... exceptions.TypeError -[1] %= ... exceptions.TypeError -[1] + ... exceptions.TypeError -[1] += ... exceptions.TypeError -[1] - ... exceptions.TypeError -[1] -= ... exceptions.TypeError -[1] * = [1, 1] -[1] *= => [1, 1] -[1] / ... exceptions.TypeError -[1] /= ... exceptions.TypeError -[1] ** ... exceptions.TypeError -[1] **= ... exceptions.TypeError -[1] % ... exceptions.TypeError -[1] %= ... exceptions.TypeError -(2,) + 2 ... exceptions.TypeError -(2,) += 2 ... exceptions.TypeError -(2,) - 2 ... exceptions.TypeError -(2,) -= 2 ... exceptions.TypeError -(2,) * 2 = (2, 2) -(2,) *= 2 => (2, 2) -(2,) / 2 ... exceptions.TypeError -(2,) /= 2 ... exceptions.TypeError -(2,) ** 2 ... exceptions.TypeError -(2,) **= 2 ... exceptions.TypeError -(2,) % 2 ... exceptions.TypeError -(2,) %= 2 ... exceptions.TypeError -(2,) + 4.0 ... exceptions.TypeError -(2,) += 4.0 ... exceptions.TypeError -(2,) - 4.0 ... exceptions.TypeError -(2,) -= 4.0 ... exceptions.TypeError -(2,) * 4.0 ... exceptions.TypeError -(2,) *= 4.0 ... exceptions.TypeError -(2,) / 4.0 ... exceptions.TypeError -(2,) /= 4.0 ... exceptions.TypeError -(2,) ** 4.0 ... exceptions.TypeError -(2,) **= 4.0 ... exceptions.TypeError -(2,) % 4.0 ... exceptions.TypeError -(2,) %= 4.0 ... exceptions.TypeError -(2,) + 2 ... exceptions.TypeError -(2,) += 2 ... exceptions.TypeError -(2,) - 2 ... exceptions.TypeError -(2,) -= 2 ... exceptions.TypeError -(2,) * 2 = (2, 2) -(2,) *= 2 => (2, 2) -(2,) / 2 ... exceptions.TypeError -(2,) /= 2 ... exceptions.TypeError -(2,) ** 2 ... exceptions.TypeError -(2,) **= 2 ... exceptions.TypeError -(2,) % 2 ... exceptions.TypeError -(2,) %= 2 ... exceptions.TypeError -(2,) + (2+0j) ... exceptions.TypeError -(2,) += (2+0j) ... exceptions.TypeError -(2,) - (2+0j) ... exceptions.TypeError -(2,) -= (2+0j) ... exceptions.TypeError -(2,) * (2+0j) ... exceptions.TypeError -(2,) *= (2+0j) ... exceptions.TypeError -(2,) / (2+0j) ... exceptions.TypeError -(2,) /= (2+0j) ... exceptions.TypeError -(2,) ** (2+0j) ... exceptions.TypeError -(2,) **= (2+0j) ... exceptions.TypeError -(2,) % (2+0j) ... exceptions.TypeError -(2,) %= (2+0j) ... exceptions.TypeError -(2,) + [1] ... exceptions.TypeError -(2,) += [1] ... exceptions.TypeError -(2,) - [1] ... exceptions.TypeError -(2,) -= [1] ... exceptions.TypeError -(2,) * [1] ... exceptions.TypeError -(2,) *= [1] ... exceptions.TypeError -(2,) / [1] ... exceptions.TypeError -(2,) /= [1] ... exceptions.TypeError -(2,) ** [1] ... exceptions.TypeError -(2,) **= [1] ... exceptions.TypeError -(2,) % [1] ... exceptions.TypeError -(2,) %= [1] ... exceptions.TypeError -(2,) + (2,) = (2, 2) -(2,) += (2,) => (2, 2) -(2,) - (2,) ... exceptions.TypeError -(2,) -= (2,) ... exceptions.TypeError -(2,) * (2,) ... exceptions.TypeError -(2,) *= (2,) ... exceptions.TypeError -(2,) / (2,) ... exceptions.TypeError -(2,) /= (2,) ... exceptions.TypeError -(2,) ** (2,) ... exceptions.TypeError -(2,) **= (2,) ... exceptions.TypeError -(2,) % (2,) ... exceptions.TypeError -(2,) %= (2,) ... exceptions.TypeError -(2,) + None ... exceptions.TypeError -(2,) += None ... exceptions.TypeError -(2,) - None ... exceptions.TypeError -(2,) -= None ... exceptions.TypeError -(2,) * None ... exceptions.TypeError -(2,) *= None ... exceptions.TypeError -(2,) / None ... exceptions.TypeError -(2,) /= None ... exceptions.TypeError -(2,) ** None ... exceptions.TypeError -(2,) **= None ... exceptions.TypeError -(2,) % None ... exceptions.TypeError -(2,) %= None ... exceptions.TypeError -(2,) + ... exceptions.TypeError -(2,) += ... exceptions.TypeError -(2,) - ... exceptions.TypeError -(2,) -= ... exceptions.TypeError -(2,) * = (2, 2) -(2,) *= => (2, 2) -(2,) / ... exceptions.TypeError -(2,) /= ... exceptions.TypeError -(2,) ** ... exceptions.TypeError -(2,) **= ... exceptions.TypeError -(2,) % ... exceptions.TypeError -(2,) %= ... exceptions.TypeError -(2,) + ... exceptions.TypeError -(2,) += ... exceptions.TypeError -(2,) - ... exceptions.TypeError -(2,) -= ... exceptions.TypeError -(2,) * = (2, 2) -(2,) *= => (2, 2) -(2,) / ... exceptions.TypeError -(2,) /= ... exceptions.TypeError -(2,) ** ... exceptions.TypeError -(2,) **= ... exceptions.TypeError -(2,) % ... exceptions.TypeError -(2,) %= ... exceptions.TypeError -None + 2 ... exceptions.TypeError -None += 2 ... exceptions.TypeError -None - 2 ... exceptions.TypeError -None -= 2 ... exceptions.TypeError -None * 2 ... exceptions.TypeError -None *= 2 ... exceptions.TypeError -None / 2 ... exceptions.TypeError -None /= 2 ... exceptions.TypeError -None ** 2 ... exceptions.TypeError -None **= 2 ... exceptions.TypeError -None % 2 ... exceptions.TypeError -None %= 2 ... exceptions.TypeError -None + 4.0 ... exceptions.TypeError -None += 4.0 ... exceptions.TypeError -None - 4.0 ... exceptions.TypeError -None -= 4.0 ... exceptions.TypeError -None * 4.0 ... exceptions.TypeError -None *= 4.0 ... exceptions.TypeError -None / 4.0 ... exceptions.TypeError -None /= 4.0 ... exceptions.TypeError -None ** 4.0 ... exceptions.TypeError -None **= 4.0 ... exceptions.TypeError -None % 4.0 ... exceptions.TypeError -None %= 4.0 ... exceptions.TypeError -None + 2 ... exceptions.TypeError -None += 2 ... exceptions.TypeError -None - 2 ... exceptions.TypeError -None -= 2 ... exceptions.TypeError -None * 2 ... exceptions.TypeError -None *= 2 ... exceptions.TypeError -None / 2 ... exceptions.TypeError -None /= 2 ... exceptions.TypeError -None ** 2 ... exceptions.TypeError -None **= 2 ... exceptions.TypeError -None % 2 ... exceptions.TypeError -None %= 2 ... exceptions.TypeError -None + (2+0j) ... exceptions.TypeError -None += (2+0j) ... exceptions.TypeError -None - (2+0j) ... exceptions.TypeError -None -= (2+0j) ... exceptions.TypeError -None * (2+0j) ... exceptions.TypeError -None *= (2+0j) ... exceptions.TypeError -None / (2+0j) ... exceptions.TypeError -None /= (2+0j) ... exceptions.TypeError -None ** (2+0j) ... exceptions.TypeError -None **= (2+0j) ... exceptions.TypeError -None % (2+0j) ... exceptions.TypeError -None %= (2+0j) ... exceptions.TypeError -None + [1] ... exceptions.TypeError -None += [1] ... exceptions.TypeError -None - [1] ... exceptions.TypeError -None -= [1] ... exceptions.TypeError -None * [1] ... exceptions.TypeError -None *= [1] ... exceptions.TypeError -None / [1] ... exceptions.TypeError -None /= [1] ... exceptions.TypeError -None ** [1] ... exceptions.TypeError -None **= [1] ... exceptions.TypeError -None % [1] ... exceptions.TypeError -None %= [1] ... exceptions.TypeError -None + (2,) ... exceptions.TypeError -None += (2,) ... exceptions.TypeError -None - (2,) ... exceptions.TypeError -None -= (2,) ... exceptions.TypeError -None * (2,) ... exceptions.TypeError -None *= (2,) ... exceptions.TypeError -None / (2,) ... exceptions.TypeError -None /= (2,) ... exceptions.TypeError -None ** (2,) ... exceptions.TypeError -None **= (2,) ... exceptions.TypeError -None % (2,) ... exceptions.TypeError -None %= (2,) ... exceptions.TypeError -None + None ... exceptions.TypeError -None += None ... exceptions.TypeError -None - None ... exceptions.TypeError -None -= None ... exceptions.TypeError -None * None ... exceptions.TypeError -None *= None ... exceptions.TypeError -None / None ... exceptions.TypeError -None /= None ... exceptions.TypeError -None ** None ... exceptions.TypeError -None **= None ... exceptions.TypeError -None % None ... exceptions.TypeError -None %= None ... exceptions.TypeError -None + ... exceptions.TypeError -None += ... exceptions.TypeError -None - ... exceptions.TypeError -None -= ... exceptions.TypeError -None * ... exceptions.TypeError -None *= ... exceptions.TypeError -None / ... exceptions.TypeError -None /= ... exceptions.TypeError -None ** ... exceptions.TypeError -None **= ... exceptions.TypeError -None % ... exceptions.TypeError -None %= ... exceptions.TypeError -None + ... exceptions.TypeError -None += ... exceptions.TypeError -None - ... exceptions.TypeError -None -= ... exceptions.TypeError -None * ... exceptions.TypeError -None *= ... exceptions.TypeError -None / ... exceptions.TypeError -None /= ... exceptions.TypeError -None ** ... exceptions.TypeError -None **= ... exceptions.TypeError -None % ... exceptions.TypeError -None %= ... exceptions.TypeError - + 2 = 4 - += 2 => 4 - - 2 = 0 - -= 2 => 0 - * 2 = 4 - *= 2 => 4 - / 2 = 1 - /= 2 => 1 - ** 2 = 4 - **= 2 => 4 - % 2 = 0 - %= 2 => 0 - + 4.0 = 6.0 - += 4.0 => 6.0 - - 4.0 = -2.0 - -= 4.0 => -2.0 - * 4.0 = 8.0 - *= 4.0 => 8.0 - / 4.0 = 0.5 - /= 4.0 => 0.5 - ** 4.0 = 16.0 - **= 4.0 => 16.0 - % 4.0 = 2.0 - %= 4.0 => 2.0 - + 2 = 4 - += 2 => 4 - - 2 = 0 - -= 2 => 0 - * 2 = 4 - *= 2 => 4 - / 2 = 1 - /= 2 => 1 - ** 2 = 4 - **= 2 => 4 - % 2 = 0 - %= 2 => 0 - + (2+0j) = (4.0 + 0.0j) - += (2+0j) => (4.0 + 0.0j) - - (2+0j) = (0.0 + 0.0j) - -= (2+0j) => (0.0 + 0.0j) - * (2+0j) = (4.0 + 0.0j) - *= (2+0j) => (4.0 + 0.0j) - / (2+0j) = (1.0 + 0.0j) - /= (2+0j) => (1.0 + 0.0j) - ** (2+0j) = (4.0 + 0.0j) - **= (2+0j) => (4.0 + 0.0j) - % (2+0j) = (0.0 + 0.0j) - %= (2+0j) => (0.0 + 0.0j) - + [1] ... exceptions.TypeError - += [1] ... exceptions.TypeError - - [1] ... exceptions.TypeError - -= [1] ... exceptions.TypeError - * [1] = [1, 1] - *= [1] => [1, 1] - / [1] ... exceptions.TypeError - /= [1] ... exceptions.TypeError - ** [1] ... exceptions.TypeError - **= [1] ... exceptions.TypeError - % [1] ... exceptions.TypeError - %= [1] ... exceptions.TypeError - + (2,) ... exceptions.TypeError - += (2,) ... exceptions.TypeError - - (2,) ... exceptions.TypeError - -= (2,) ... exceptions.TypeError - * (2,) = (2, 2) - *= (2,) => (2, 2) - / (2,) ... exceptions.TypeError - /= (2,) ... exceptions.TypeError - ** (2,) ... exceptions.TypeError - **= (2,) ... exceptions.TypeError - % (2,) ... exceptions.TypeError - %= (2,) ... exceptions.TypeError - + None ... exceptions.TypeError - += None ... exceptions.TypeError - - None ... exceptions.TypeError - -= None ... exceptions.TypeError - * None ... exceptions.TypeError - *= None ... exceptions.TypeError - / None ... exceptions.TypeError - /= None ... exceptions.TypeError - ** None ... exceptions.TypeError - **= None ... exceptions.TypeError - % None ... exceptions.TypeError - %= None ... exceptions.TypeError - + = 4 - += => 4 - - = 0 - -= => 0 - * = 4 - *= => 4 - / = 1 - /= => 1 - ** = 4 - **= => 4 - % = 0 - %= => 0 - + = 4 - += => 4 - - = 0 - -= => 0 - * = 4 - *= => 4 - / = 1 - /= => 1 - ** = 4 - **= => 4 - % = 0 - %= => 0 - + 2 = 4 - += 2 => 4 - - 2 = 0 - -= 2 => 0 - * 2 = 4 -

-hello from <__main__.Tag instance at 0x402ce8ec> -

-hello from <main.Tag instance at 0x402ce8ec> -