Mailman 3 August 2004 - Python-checkins

python/nondist/peps pep-0333.txt,1.3,1.4
by pje＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/nondist/peps In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25905 Modified Files: pep-0333.txt Log Message: Major clarifications and some minor semantic changes; see http://mail.python.org/pipermail/web-sig/2004-August/000730.htm for a complete summary of the changes and their rationales. Index: pep-0333.txt =================================================================== RCS file: /cvsroot/python/python/nondist/peps/pep-0333.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- pep-0333.txt 30 Aug 2004 03:04:59 -0000 1.3 +++ pep-0333.txt 31 Aug 2004 22:00:28 -0000 1.4 @@ -53,7 +53,7 @@ However, since no existing servers or frameworks support WSGI, there is little immediate reward for an author who implements WSGI support. -Thus, WSGI *must* be easy to implement, so that an author's initial +Thus, WSGI **must** be easy to implement, so that an author's initial investment in the interface can be reasonably low. Thus, simplicity of implementation on *both* the server and framework @@ -146,17 +146,23 @@ """Simplest possible application object""" status = '200 OK' headers = [('Content-type','text/plain')] - write = start_response(status, headers) - write('Hello world!\n') + start_response(status, headers) + return ['Hello world!\n'] class AppClass: - """Much the same thing, but as a class + """Produce the same output, but using a class - (Note: 'AppClass' is the "application", so calling it - returns an instance of 'AppClass', which is the iterable - return value of the "application callable", as required - by the spec.) + (Note: 'AppClass' is the "application" here, so calling it + returns an instance of 'AppClass', which is then the iterable + return value of the "application callable" as required by + the spec. + + If we wanted to use *instances* of 'AppClass' as application + objects instead, we would have to implement a '__call__' + method, which would be invoked to execute the application, + and we would need to create an instance for use by the + server or gateway. """ def __init__(self, environ, start_response): @@ -167,10 +173,7 @@ status = '200 OK' headers = [('Content-type','text/plain')] self.start(status, headers) - yield "Hello world!\n" - for i in range(1,11): - yield "Extra line %s\n" % i Throughout this specification, we will use the term "a callable" to mean "a function, method, class, or an instance with a ``__call__`` @@ -200,22 +203,26 @@ environ['wsgi.multiprocess'] = True environ['wsgi.last_call'] = True + def write(data): + sys.stdout.write(data) + sys.stdout.flush() + def start_response(status,headers): - write = sys.stdout.write - write("Status: %s\r\n" % status) + + sys.stdout.write("Status: %s\r\n" % status) for key,val in headers: - write("%s: %s\r\n" % (key,val)) - write("\r\n") + sys.stdout.write("%s: %s\r\n" % (key,val)) + sys.stdout.write("\r\n") + return write result = application(environ, start_response) - if result is not None: - try: - for data in result: - sys.stdout.write(data) - finally: - if hasattr(result,'close'): - result.close() + try: + for data in result: + write(data) + finally: + if hasattr(result,'close'): + result.close() In the next section, we will specify the precise semantics that these illustrations are examples of. @@ -227,12 +234,12 @@ The application object must accept two positional arguments. For the sake of illustration, we have named them ``environ`` and ``start_response``, but they are not required to have these names. -A server or gateway *must* invoke the application object using +A server or gateway **must** invoke the application object using positional (not keyword) arguments. (E.g. by calling ``result = application(environ,start_response)`` as shown above.) The ``environ`` parameter is a dictionary object, containing CGI-style -environment variables. This object *must* be a builtin Python +environment variables. This object **must** be a builtin Python dictionary (*not* a subclass, ``UserDict`` or other dictionary emulation), and the application is allowed to modify the dictionary in any way it desires. The dictionary must also include certain @@ -243,7 +250,7 @@ The ``start_response`` parameter is a callable accepting two positional arguments. For the sake of illustration, we have named them ``status`` and ``headers``, but they are not required to have -these names, and the application *must* invoke the ``start_response`` +these names, and the application **must** invoke the ``start_response`` callable using positional arguments (e.g. ``start_response(status,headers)``). @@ -252,21 +259,31 @@ tuples describing the HTTP response header. This ``start_response`` callable must return a ``write(body_data)`` callable that takes one positional parameter: a string to be written as part of the HTTP -response body. +response body. (Note: the ``write()`` callable is provided only +to support certain existing frameworks' imperative output APIs; +it should not be used by new applications or frameworks. See +the `Buffering and Streaming`_ section for more details.) -The application object may return either ``None`` (indicating that -there is no additional output), or it may return a non-empty -iterable yielding strings. (For example, it could be a -generator-iterator that yields strings, or it could be a -sequence such as a list of strings.) The server or gateway will -treat the strings yielded by the iterable as if they had been -passed to the ``write()`` method. If a call to ``len(iterable)`` -succeeds, the server must be able to rely on the result being -accurate. That is, if the iterable returned by the application -provides a working ``__len__()`` method, it *must* return an -accurate result. +The application object must return an iterable yielding strings. +(For example, it could be a generator-iterator that yields strings, +or it could be a sequence such as a list of strings.) The server +or gateway must transmit these strings to the client in an +unbuffered fashion, completing the transmission of each string +before requesting another one. (See the `Buffering and Streaming`_ +section below for more on how application output must be handled.) -If the returned iterable has a ``fileno`` attribute, the server *may* +The server or gateway must not modify supplied strings in any way; +they must be treated as binary byte sequences with no character +interpretation, line ending changes, or other modification. The +application is responsible for ensuring that the string(s) to be +written are in a format suitable for the client. + +If a call to ``len(iterable)`` succeeds, the server must be able +to rely on the result being accurate. That is, if the iterable +returned by the application provides a working ``__len__()`` +method, it **must** return an accurate result. + +If the returned iterable has a ``fileno`` attribute, the server **may** assume that this is a ``fileno()`` method returning an operating system file descriptor, and that it is allowed to read directly from that descriptor up to the end of the file, and/or use any appropriate @@ -275,20 +292,36 @@ transmission with the file's current position, and end at the end of the file. -Finally, if the application returned an iterable, and the iterable has -a ``close()`` method, the server or gateway *must* call that method -upon completion of the current request, whether the request was -completed normally, or terminated early due to an error. (This is to -support resource release by the application. This protocol is -intended to support PEP 325, and also the simple case of an -application returning an open text file.) +Note that an application **must not** return an iterable with a +``fileno`` attribute if it is anything other than a method returning +an **operating system file descriptor**. "File-like" objects +that do not possess a true operating system file descriptor number +are expressly forbidden. Servers running on platforms where file +descriptors do not exist, or where there is no meaningful API for +accelerating transmission from a file descriptor should ignore the +``fileno`` attribute. -(Note: the application *must* invoke the ``start_response()`` callable -before the iterable yields its first body string, so that the server -can send headers before any body content. However, this invocation -*may* be performed by the iterable's first iteration, so servers *must -not* assume that ``start_response()`` has been called before they -begin iterating over the iterable.) +If the iterable returned by the application has a ``close()`` method, +the server or gateway **must** call that method upon completion of the +current request, whether the request was completed normally, or +terminated early due to an error. (This is to support resource release +by the application. This protocol is intended to support PEP 325, and +also other simple cases such as an application returning an open text +file.) + +(Note: the application **must** invoke the ``start_response()`` +callable before the iterable yields its first body string, so that the +server can send the headers before any body content. However, this +invocation **may** be performed by the iterable's first iteration, so +servers **must not** assume that ``start_response()`` has been called +before they begin iterating over the iterable.) + +Finally, servers **must not** directly use any other attributes of +the iterable returned by the application. For example, it the +iterable is a file object, it may have a ``read()`` method, but +the server **must not** utilize it. Only attributes specified +here, or accessed via e.g. the PEP 234 iteration APIs are +acceptable. ``environ`` Variables @@ -296,8 +329,8 @@ The ``environ`` dictionary is required to contain these CGI environment variables, as defined by the Common Gateway Interface -specification [2]_. The following variables *must* be present, but -*may* be an empty string, if there is no more appropriate value for +specification [2]_. The following variables **must** be present, but +**may** be an empty string, if there is no more appropriate value for them: * ``REQUEST_METHOD`` @@ -446,11 +479,11 @@ example, to minimize intermingling of data from multiple processes writing to the same error log.) -The methods listed in the table above *must* be supported by all +The methods listed in the table above **must** be supported by all servers conforming to this specification. Applications conforming -to this specification *must not* use any other methods or attributes +to this specification **must not** use any other methods or attributes of the ``input`` or ``errors`` objects. In particular, applications -*must not* attempt to close these streams, even if they possess +**must not** attempt to close these streams, even if they possess ``close()`` methods. @@ -462,36 +495,46 @@ (As with all WSGI callables, the arguments must be supplied positionally, not by keyword.) The ``start_response`` callable is used to begin the HTTP response, and it must return a -``write(body_data)`` callable. +``write(body_data)`` callable (see the `Buffering and Streaming`_ +section, below). The ``status`` argument is an HTTP "status" string like ``"200 OK"`` -or ``"404 Not Found"``. The string *must* be pure 7-bit ASCII, +or ``"404 Not Found"``. The string **must** be pure 7-bit ASCII, containing no control characters. It must not be terminated with a carriage return or linefeed. -The ``headers`` argument is a sequence of -``(header_name,header_value)`` tuples. Each ``header_name`` must be a -valid HTTP header name, without a trailing colon or other punctuation. -Each ``header_value`` *must not* include *any* control characters, -including carriage returns or linefeeds, either embedded or at the -end. (These requirements are to minimize the complexity of any -parsing that must be performed by servers, gateways, and intermediate -response processors that need to inspect or modify response headers.) +The ``headers`` argument is a list of ``(header_name,header_value)`` +tuples. It must be a Python list; i.e. ``type(headers) is +ListType)``, and the server **may** change its contents in any way +it desires. Each ``header_name`` must be a valid HTTP header name, +without a trailing colon or other punctuation. Each ``header_value`` +**must not** include *any* control characters, including carriage +returns or linefeeds, either embedded or at the end. (These +requirements are to minimize the complexity of any parsing that must +be performed by servers, gateways, and intermediate response +processors that need to inspect or modify response headers.) In general, the server or gateway is responsible for ensuring that correct headers are sent to the client: if the application omits a needed header, the server or gateway *should* add it. For example, the HTTP ``Date:`` and ``Server:`` headers would normally be supplied -by the server or gateway. If the application supplies a header that -the server would ordinarily supply, or that contradicts the server's -intended behavior (e.g. supplying a different ``Connection:`` header), -the server or gateway *may* discard the conflicting header, provided -that its action is recorded for the benefit of the application author. +by the server or gateway. (A reminder for server/gateway authors: HTTP header names are case-insensitive, so be sure to take that into consideration when examining application-supplied headers!) +If the application supplies headers that would affect the persistence +of the client's connection (e.g. ``Connection:``, "keep-alives", etc.), +the server or gateway is permitted to discard or modify these headers, +if the server cannot or will not conform to the application's requested +semantics. E.g., if the application requests a persistent connection +but the server wishes transience, or vice versa. + +However, if a server or gateway discards or overrides any application +header for any reason, it **must** record this action in a log (such as +the ``wsgi.errors`` log) for the benefit of the application author. + Handling the ``Content-Length`` Header ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -510,64 +553,102 @@ by the iterable. And, if the server and client both support HTTP/1.1 "chunked -encoding" [3]_, then the server *may* use chunked encoding to send +encoding" [3]_, then the server **may** use chunked encoding to send a chunk for each ``write()`` call or string yielded by the iterable, thus generating a ``Content-Length`` header for each chunk. This allows the server to keep the client connection alive, if it wishes -to do so. Note that the server *must* comply fully with RFC 2616 when -doing this, or else fall back to one of the other strategies for +to do so. Note that the server **must** comply fully with RFC 2616 +when doing this, or else fall back to one of the other strategies for dealing with the absence of ``Content-Length``. -The ``write()`` Callable ------------------------- - -The return value of the ``start_response()`` callable is a -one-argument `write()`` callable, that accepts strings to write as -part of the HTTP response body. The server or gateway must -not modify supplied strings in any way; they must be treated -as binary byte sequences with no character interpretation, line -ending changes, or other modification. The application is responsible -for ensuring that the string(s) to be written are in a format suitable -for the client. - -Note that the purpose of the ``write()`` callable is primarily to -support existing application frameworks that support a streaming -"push" API. Therefore, strings passed to ``write()`` *must* be sent -to the client *as soon as possible*; they must *not* be buffered -unless the buffer will be emptied in parallel with the application's -continuing execution (e.g. by a separate I/O thread). If the server -or gateway does not have a separate I/O thread available, it *must* -finish writing the supplied string before it returns from each -``write()`` invocation. - -If the application returns an iterable, each string produced by the -iterable must be treated as though it had been passed to ``write()``, -with the data sent in an "as soon as possible" manner. That is, -the iterable should not be asked for a new string until the previous -string has been sent to the client, or is buffered for such sending -by a parallel thread. +Buffering and Streaming +----------------------- -Notice that these rules discourage the generation of content before a -client is ready for it, in excess of the buffer sizes provided by the -server and operating system. For this reason, some applications may -wish to buffer data internally before passing any of it to ``write()`` -or yielding it from an iterator, in order to avoid waiting for the -client to catch up with their output. This approach may yield better -throughput for dynamically generated pages of moderate size, since the -application is then freed for other tasks. +Generally speaking, applications will achieve the best throughput +by buffering their (modestly-sized) output and sending it all at +once. When this is the case, applications **should** simply +return a single-element iterable containing their entire output as +a single string. -In addition to improved performance, buffering all of an application's +(In addition to improved performance, buffering all of an application's output has an advantage for error handling: the buffered output can -be thrown away and replaced by an error page, rather than dumping an +be discarded and replaced by an error page, rather than dumping an error message in the middle of some partially-completed output. For this and other reasons, many existing Python frameworks already accumulate their output for a single write, unless the application explicitly requests streaming, or the expected output is larger than -practical for buffering (e.g. multi-megabyte PDFs). So, these -application frameworks are already a natural fit for the WSGI -streaming model: for most requests they will only call ``write()`` -once anyway! +practical for buffering (e.g. multi-megabyte PDFs).) + +For large files, however, or for specialized uses of HTTP streaming +(such as multipart "server push"), an application may need to provide +output in smaller blocks (e.g. to avoid loading a large file into +memory). It's also sometimes the case that part of a response may +be time-consuming to produce, but it would be useful to send ahead the +portion of the response that precedes it. + +In these cases, applications **should** return an iterator (usually +a generator-iterator) that produces the output in a block-by-block +fashion. These blocks may be broken to coincide with mulitpart +boundaries (for "server push"), or just before time-consuming +tasks (such as reading another block of an on-disk file). + +WSGI servers and gateways **must not** delay the transmission +of any block; they **must** either fully transmit the block to +the client, or guarantee that they will continue transmission +even while the application is producing its next block. A +server/gateway may provide this guarantee in one of two ways: + +1. Send the entire block to the operating system (and request + that any O/S buffers be flushed) before returning control + to the application, OR + +2. Use a different thread to ensure that the block continues + to be transmitted while the application produces the next + block. + +By providing this guarantee, WSGI allows applications to ensure +that transmission will not become stalled at an arbitrary point +in their output data. This is critical for proper functioning +of e.g. multipart "server push" streaming, where data between +multipart boundaries should be transmitted in full to the client. + + +The ``write()`` Callable +~~~~~~~~~~~~~~~~~~~~~~~~ + +Some existing application framework APIs support unbuffered +output in a different manner than WSGI. Specifically, they +provide a "write" function or method of some kind to write +an unbuffered block of data, or else they provide a buffered +"write" function and a "flush" mechanism to flush the buffer. + +Unfortunately, such APIs cannot be implemented in terms of +WSGI's "iterable" application return value, unless threads +or other special mechanisms are used. + +Therefore, to allow these frameworks to continue using an +imperative API, WSGI includes a special ``write()`` callable, +returned by the ``start_response`` callable. + +New WSGI applications and frameworks **should not** use the +``write()`` callable if it is possible to avoid doing so. The +``write()`` callable is strictly a hack to support existing +frameworks' imperative APIs. In general, applications +should either be internally buffered, or produce iterable output. + +The ``write()`` callable is returned by the ``start_response()`` +callable, and it accepts a single parameter: a string to be +written as part of the HTTP response body, that is treated exactly +as though it had been yielded by the output iterable. In other +words, before ``write()`` returns, it must guarantee that the +passed-in string was either completely sent to the client, or +that it is buffered for transmission while the application +proceeds forward. + +An application **may** return a non-empty iterable even if it +invokes ``write()``, and that output must be treated normally +by the server or gateway. Implementation/Application Notes @@ -594,7 +675,7 @@ -------------- Servers *should* trap and log exceptions raised by -applications, and *may* continue to execute, or attempt to shut down +applications, and **may** continue to execute, or attempt to shut down gracefully. Applications *should* avoid allowing exceptions to escape their execution scope, since the result of uncaught exceptions is server-defined. @@ -687,6 +768,48 @@ a possibility. +Supporting Older (<2.2) Versions of Python +------------------------------------------ + +Some servers, gateways, or applications may wish to support older +(<2.2) versions of Python. This is especially important if Jython +is a target platform, since as of this writing a production-ready +version of Jython 2.2 is not yet available. + +For servers and gateways, this is relatively straightforward: +servers and gateways targeting pre-2.2 versions of Python must +simply restrict themselves to using only a standard "for" loop to +iterate over any iterable returned by an application. This is the +only way to ensure source-level compatibility with both the pre-2.2 +iterator protocol (discussed further below) and "today's" iterator +protocol (see PEP 234). + +(Note that this technique necessarily applies only to servers, +gateways, or middleware that are written in Python. Discussion of +how to use iterator protocol(s) correctly from other languages is +outside the scope of this PEP.) + +For applications, supporting pre-2.2 versions of Python is slightly +more complex: + +* You may not return a file object and expect it to work as an iterable, + since before Python 2.2, files were not iterable. + +* If you return an iterable, it **must** implement the pre-2.2 iterator + protocol. That is, provide a ``__getitem__`` method that accepts + an integer key, and raises ``IndexError`` when exhausted. + +Finally, middleware that wishes to support pre-2.2 versions of Python, +and iterates over application return values or itself returns an +iterable (or both), must follow the appropriate recommendations above. + +(Note: It should go without saying that to support pre-2.2 versions +of Python, any server, gateway, application, or middleware must also +use only language features available in the target version, use +1 and 0 instead of ``True`` and ``False``, etc.) + + + Server Extension APIs --------------------- @@ -710,7 +833,7 @@ frameworks to function almost entirely as middleware of various kinds. So, to provide maximum compatibility, servers and gateways that -provide extension APIs that replace some WSGI functionality, *must* +provide extension APIs that replace some WSGI functionality, **must** design those APIs so that they are invoked using the portion of the API that they replace. For example, an extension API to access HTTP request headers must require the application to pass in its current @@ -747,9 +870,9 @@ HTTP 1.1 Expect/Continue ------------------------ -Servers and gateways *must* provide transparent support for HTTP 1.1's -"expect/continue" mechanism, if they implement HTTP 1.1. This may be -done in any of several ways: +Servers and gateways **must** provide transparent support for HTTP +1.1's "expect/continue" mechanism, if they implement HTTP 1.1. This +may be done in any of several ways: 1. Reject all client requests containing an ``Expect: 100-continue`` header with a "417 Expectation failed" error. Such requests will @@ -918,71 +1041,28 @@ Open Issues =========== -The format of the ``headers`` passed to the ``start_response`` -callable has seen some debate. Currently, it is a sequence of tuples, -but other formats have been suggested, such as a dictionary of lists, -or an ``email.Message`` object (from the Python standard library's -``email`` package). For various practical reasons, the "dictionary of -lists" approach has been ruled out, but ``email.Message`` is still a -candidate, as it provides several advantages for many middleware -developers and some application or framework developers, without an -excessive burden to anyone else. - -Specifically, ``email.Message`` objects offer a mutable data -structure, (not unlike a case-insensitive dictionary) for containing -MIME headers, such as those used in an HTTP response. This makes it -very easy to modify headers, or add multi-valued headers such as -``Set-Cookie`` headers. If the ``headers`` passed to -``start_response`` were an ``email.Message``, then it would be easy -for middleware and servers to modify response headers, e.g. to supply -defaults for missing headers. It also leads to cleaner-looking -application code in some cases, e.g.:: - - from email.Message import Message - - def application(environ, start_response): - headers = Message() - headers.set_type("text/plain") - headers.add_header("Set-Cookie", "FOO=BAR", path="/foobar") - start("200 OK", headers)("Hello world!") - -Some have pointed out that this requires the developers of existing -frameworks to convert whatever header format they use to an -``email.Message``. But this is only relevant if the format they -already use is a list of name/value pairs: in all other cases they -would have to perform some conversion anyway. - -In the event that the ``email.Message`` format is *not* chosen, -however, application developers will still have the option of using it -as a helper class. For example, the code below works with the current -WSGI spec, by passing the message object's ``items()`` (a list of -tuples) to ``start_response()``:: - - def application(environ, start_response): - headers = Message() - headers.set_type("text/plain") - headers.add_header("Set-Cookie", "FOO=BAR", path="/foobar") - start_response("200 OK", headers.items())("Hello world!") - -But this doesn't help middleware authors, who would have to convert -the response headers into a ``Message`` object and back again if they -needed to modify the headers. - -One other issue that's been brought up in relation to -``email.Message`` is that its ``set_type()`` method also sets a -``MIME-Version`` header. In order to comply properly with the MIME -and HTTP specifications, it would then be necessary for server/gateway -authors to ensure the presence of a ``Content-Transfer-Encoding``, -e.g.:: - - if ('MIME-Version' in headers and - 'Content-Transfer-Encoding' not in headers - ): - headers['Content-Transfer-Encoding'] = "8bit" - -Also, ``email.Message`` has various features unrelated to HTTP or WSGI -that should not be used, and might be distracting or confusing to -authors. +* Some persons have requested information about whether the + ``HTTP_AUTHENTICATION`` header may be provided by the server. + That is, some web servers do not supply this information to + e.g. CGI applications, and they would like the application + to know that this is the case so it can use alternative + means of authentication. + +* Error handling: strategies for effective error handling are + currently in discussion on the Web-SIG mailing list. In + particular, a mechanism for specifying what errors an + application or middleware should *not* trap (because they + indicate that the request should be aborted), and mechanisms + for servers, gateways, and middleware to handle exceptions + occurring at various phases of the response processing. + +* Byte strings: future versions of Python may replace today's + 8-bit strings with some kind of "byte array" type. Some sort + of future-proofing would be good to have, and strategies for + this should be discussed on Web-SIG and Python-Dev. Nearly + every string in WSGI is potentially affected by this, although + some contexts should perhaps continue to allow strings as long as + they're pure ASCII. Acknowledgements

1 0

python/dist/src/PC/os2vacpp makefile,1.9,1.10
by rhettinger＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PC/os2vacpp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29647 Modified Files: makefile Log Message: Remove rotor from the build. Index: makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/makefile,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- makefile 29 Mar 2004 11:49:24 -0000 1.9 +++ makefile 31 Aug 2004 19:33:47 -0000 1.10 @@ -194,7 +194,6 @@ $(PATHOBJ)\Operator.obj \ $(PATHOBJ)\PCREModule.obj \ $(PATHOBJ)\PyPCRE.obj \ - $(PATHOBJ)\RotorModule.obj \ $(PATHOBJ)\PosixModule.obj \ $(PATHOBJ)\RegexModule.obj \ $(PATHOBJ)\RegExpr.obj \ @@ -1005,20 +1004,6 @@ $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ $(PY_INCLUDE)\tupleobject.h -rotormodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ - $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ - pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \ - $(PY_INCLUDE)\floatobject.h $(PY_INCLUDE)\funcobject.h $(PY_INCLUDE)\import.h \ - $(PY_INCLUDE)\intobject.h $(PY_INCLUDE)\intrcheck.h $(PY_INCLUDE)\listobject.h \ - $(PY_INCLUDE)\longobject.h $(PY_INCLUDE)\methodobject.h \ - $(PY_INCLUDE)\modsupport.h $(PY_INCLUDE)\moduleobject.h $(PY_INCLUDE)\mymalloc.h \ - $(PY_INCLUDE)\mymath.h $(PY_INCLUDE)\myproto.h $(PY_INCLUDE)\object.h \ - $(PY_INCLUDE)\objimpl.h $(PY_INCLUDE)\pydebug.h $(PY_INCLUDE)\pyerrors.h \ - $(PY_INCLUDE)\pyfpe.h $(PY_INCLUDE)\pystate.h $(PY_INCLUDE)\python.h \ - $(PY_INCLUDE)\pythonrun.h $(PY_INCLUDE)\rangeobject.h $(PY_INCLUDE)\sliceobject.h \ - $(PY_INCLUDE)\stringobject.h $(PY_INCLUDE)\sysmodule.h $(PY_INCLUDE)\traceback.h \ - $(PY_INCLUDE)\tupleobject.h - selectmodule.obj: $(PY_INCLUDE)\abstract.h $(PY_INCLUDE)\ceval.h \ $(PY_INCLUDE)\classobject.h $(PY_INCLUDE)\cobject.h $(PY_INCLUDE)\complexobject.h \ pyconfig.h $(PY_INCLUDE)\dictobject.h $(PY_INCLUDE)\fileobject.h \

1 0

python/dist/src/PC/VC6 pythoncore.dsp,1.13,1.14
by rhettinger＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PC/VC6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21861 Modified Files: pythoncore.dsp Log Message: Remove rotor and xreadlines from VC 6 build. Index: pythoncore.dsp =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/VC6/pythoncore.dsp,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- pythoncore.dsp 28 Jul 2004 09:45:19 -0000 1.13 +++ pythoncore.dsp 31 Aug 2004 18:54:35 -0000 1.14 @@ -523,10 +523,6 @@ # End Source File # Begin Source File -SOURCE=..\..\Modules\rotormodule.c -# End Source File -# Begin Source File - SOURCE=..\..\Objects\setobject.c # End Source File # Begin Source File @@ -615,10 +611,6 @@ # End Source File # Begin Source File -SOURCE=..\..\Modules\xreadlinesmodule.c -# End Source File -# Begin Source File - SOURCE=..\..\Modules\xxsubtype.c # End Source File # Begin Source File

1 0

python/dist/src/PCbuild readme.txt,1.57,1.58
by loewis＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27559 Modified Files: readme.txt Log Message: Add instructions for building Tix Index: readme.txt =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- readme.txt 30 Aug 2004 21:14:51 -0000 1.57 +++ readme.txt 31 Aug 2004 16:22:09 -0000 1.58 @@ -114,6 +114,15 @@ all.tcl: Total 8420 Passed 6826 Skipped 1581 Failed 13 Sourced 91 Test Files. Files with failing tests: canvImg.test scrollbar.test textWind.test winWm.test + + Built Tix + --------- + Download from http://prdownloads.sourceforge.net/tix/tix-8.1.4.tar.gz + cd dist\tix-8.1.4 + [cygwin]patch -p1 < ..\..\python\PC\tix.diff + cd win + nmake -f makefile.vc + nmake -f makefile.vc install zlib Python wrapper for the zlib compression library. Get the source code

1 0

python/dist/src/PC tix.diff,1.1,1.2
by loewis＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26735 Modified Files: tix.diff Log Message: Fix installdir for Tix Index: tix.diff =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/tix.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- tix.diff 31 Aug 2004 06:43:28 -0000 1.1 +++ tix.diff 31 Aug 2004 16:19:01 -0000 1.2 @@ -10,7 +10,7 @@ ITCL_VER = -INSTALLDIR = C:\progra~1\tcl -+INSTALLDIR = ..\..\tcl84 ++INSTALLDIR = ..\..\tcltk !IFNDEF TIX_DEBUG NODEBUG = 1

1 0

python/dist/src/PCbuild pythoncore.vcproj, 1.18, 1.19
by tim_one＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PCbuild In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5009/PCbuild Modified Files: pythoncore.vcproj Log Message: Remove rotor and xreadlines from VC 7.1 build. Index: pythoncore.vcproj =================================================================== RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.vcproj,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- pythoncore.vcproj 4 Aug 2004 13:42:43 -0000 1.18 +++ pythoncore.vcproj 31 Aug 2004 14:29:12 -0000 1.19 @@ -2680,33 +2680,6 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\rotormodule.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - </File> - <File RelativePath="..\Objects\setobject.c"> <FileConfiguration Name="Release|Win32"> @@ -3277,33 +3250,6 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\xreadlinesmodule.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - </File> - <File RelativePath="..\Modules\xxsubtype.c"> <FileConfiguration Name="Release|Win32">

1 0

python/dist/src/PC config.c,1.49,1.50
by tim_one＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/PC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5009/PC Modified Files: config.c Log Message: Remove rotor and xreadlines from VC 7.1 build. Index: config.c =================================================================== RCS file: /cvsroot/python/python/dist/src/PC/config.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -d -r1.49 -r1.50 --- config.c 28 Jul 2004 09:39:54 -0000 1.49 +++ config.c 31 Aug 2004 14:29:12 -0000 1.50 @@ -24,7 +24,6 @@ #ifndef MS_WIN64 extern void initrgbimg(void); #endif -extern void initrotor(void); extern void initsignal(void); extern void initsha(void); extern void initstrop(void); @@ -38,7 +37,6 @@ extern void init_locale(void); #endif extern void init_codecs(void); -extern void initxreadlines(void); extern void init_weakref(void); extern void init_hotshot(void); extern void initxxsubtype(void); @@ -93,7 +91,6 @@ #ifndef MS_WIN64 {"rgbimg", initrgbimg}, #endif - {"rotor", initrotor}, {"signal", initsignal}, {"sha", initsha}, {"strop", initstrop}, @@ -110,7 +107,6 @@ #endif {"_codecs", init_codecs}, - {"xreadlines", initxreadlines}, {"_weakref", init_weakref}, {"_hotshot", init_hotshot}, {"_random", init_random},

1 0

python/dist/src/Misc NEWS,1.1125,1.1126
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30949 Modified Files: NEWS Log Message: Add news item. Index: NEWS =================================================================== RCS file: /cvsroot/python/python/dist/src/Misc/NEWS,v retrieving revision 1.1125 retrieving revision 1.1126 diff -u -d -r1.1125 -r1.1126 --- NEWS 31 Aug 2004 10:07:10 -0000 1.1125 +++ NEWS 31 Aug 2004 13:50:43 -0000 1.1126 @@ -79,6 +79,9 @@ - Added CurrentByteIndex, CurrentColumnNumber, CurrentLineNumber members to xml.parsers.expat.XMLParser object. +- The mpz, rotor, and xreadlines modules, all deprecated in earlier + versions of Python, have now been removed. + Library -------

2 1

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.94, 1.95
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31977 Modified Files: whatsnew24.tex Log Message: Add item Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.94 retrieving revision 1.95 diff -u -d -r1.94 -r1.95 --- whatsnew24.tex 31 Aug 2004 12:21:44 -0000 1.94 +++ whatsnew24.tex 31 Aug 2004 13:57:02 -0000 1.95 @@ -1245,6 +1245,9 @@ \item The \module{xmlrpclib} module now supports a multi-call extension for transmitting multiple XML-RPC calls in a single HTTP operation. + +\item The \module{mpz}, \module{rotor}, and \module{xreadlines} modules have +been removed. \end{itemize}

1 0

python/dist/src/RISCOS Makefile,1.7,1.8
by akuchling＠users.sourceforge.net Aug. 31, 2004

Aug. 31, 2004

Update of /cvsroot/python/python/dist/src/RISCOS In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31286 Modified Files: Makefile Log Message: Remove rotor, xreadlines modules Index: Makefile =================================================================== RCS file: /cvsroot/python/python/dist/src/RISCOS/Makefile,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile 2 Jun 2004 17:53:57 -0000 1.7 +++ Makefile 31 Aug 2004 13:52:27 -0000 1.8 @@ -76,7 +76,6 @@ @.^.Lib.parser/pyd\ @.^.Lib.regex/pyd\ @.^.Lib.rgbimg/pyd\ - @.^.Lib.rotor/pyd\ @.^.Lib.sha/pyd\ @.^.Lib.signal/pyd\ @.^.Lib.struct/pyd\ @@ -89,7 +88,6 @@ @.^.Lib._weakref/pyd\ @.^.Lib._testcapi/pyd\ @.^.Lib.unicodedata/pyd\ - @.^.Lib.xreadlines/pyd\ @.^.Lib.pyexpat/pyd\ @.^.Lib.plat-riscos.drawf/pyd\ @.^.Lib.plat-riscos.swi/pyd\ @@ -293,9 +291,6 @@ @.^.Lib.rgbimg/pyd: @.^.Modules.o.rgbimgmodule s.linktab $(MAKEDLK) -d @.^.Lib.rgbimg/pyd -s s.linktab -o @.^.Modules.o.rgbimgmodule -e initrgbimg -@.^.Lib.rotor/pyd: @.^.Modules.o.rotormodule s.linktab - $(MAKEDLK) -d @.^.Lib.rotor/pyd -s s.linktab -o @.^.Modules.o.rotormodule -e initrotor - @.^.Lib.sha/pyd: @.^.Modules.o.shamodule s.linktab $(MAKEDLK) -d @.^.Lib.sha/pyd -s s.linktab -o @.^.Modules.o.shamodule -e initsha @@ -330,9 +325,6 @@ @.^.Lib.unicodedata/pyd: @.^.Modules.o.unicodedata s.linktab $(MAKEDLK) -d @.^.Lib.unicodedata/pyd -s s.linktab -o @.^.Modules.o.unicodedata -e initunicodedata -@.^.Lib.xreadlines/pyd: @.^.Modules.o.xreadlinesmodule s.linktab - $(MAKEDLK) -d @.^.Lib.xreadlines/pyd -s s.linktab -o @.^.Modules.o.xreadlinesmodule -e initxreadlines - @.^.Lib.xxsubtype/pyd: @.^.Modules.o.xxsubtype s.linktab $(MAKEDLK) -d @.^.Lib.xxsubtype/pyd -s s.linktab -o @.^.Modules.o.xxsubtype -e initxxsubtype

1 0