Mailman 3 April 2006 - Python-checkins

r45824 - python/trunk/Lib/inspect.py
by georg.brandl May 4, 2006

May 4, 2006

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')

3 2

r45822 - python/trunk/Lib/inspect.py
by phillip.eby May 4, 2006

May 4, 2006

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 <string> or <stdin> 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 - '<stdin>' and '<string>' 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):

2 1

r45794 - peps/trunk/pep-3099.txt
by guido.van.rossum May 1, 2006

May 1, 2006

Author: guido.van.rossum Date: Fri Apr 28 22:05:59 2006 New Revision: 45794 Modified: peps/trunk/pep-3099.txt Log: No Unicode for operators or names. Modified: peps/trunk/pep-3099.txt ============================================================================== --- peps/trunk/pep-3099.txt (original) +++ peps/trunk/pep-3099.txt Fri Apr 28 22:05:59 2006 @@ -47,6 +47,12 @@ Thread: "Adding sorting to generator comprehension", http://mail.python.org/pipermail/python-3000/2006-April/001295.html +* Python won't use Unicode characters for anything except string + literals or comments. + + Thread: sets in P3K? + http://mail.python.org/pipermail/python-3000/2006-April/01474.html + Builtins ========

2 1

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

April 30, 2006

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

3 2

r45829 - in python/branches/release24-maint/Lib: email/_parseaddr.py email/test/test_email.py rfc822.py test/test_rfc822.py
by barry.warsaw April 30, 2006

April 30, 2006

Author: barry.warsaw Date: Sun Apr 30 23:26:41 2006 New Revision: 45829 Modified: python/branches/release24-maint/Lib/email/_parseaddr.py python/branches/release24-maint/Lib/email/test/test_email.py python/branches/release24-maint/Lib/rfc822.py python/branches/release24-maint/Lib/test/test_rfc822.py Log: Patch #1464708 from William McVey: fixed handling of nested comments in mail addresses. E.g. "Foo ((Foo Bar)) <foo(a)example.com>" Fixes for both rfc822.py and email package. This patch needs to be back ported to Python 2.3 for email 2.5 and forward ported to Python 2.5 for email 4.0. (I'll do both soon) Modified: python/branches/release24-maint/Lib/email/_parseaddr.py ============================================================================== --- python/branches/release24-maint/Lib/email/_parseaddr.py (original) +++ python/branches/release24-maint/Lib/email/_parseaddr.py Sun Apr 30 23:26:41 2006 @@ -360,6 +360,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/release24-maint/Lib/email/test/test_email.py ============================================================================== --- python/branches/release24-maint/Lib/email/test/test_email.py (original) +++ python/branches/release24-maint/Lib/email/test/test_email.py Sun Apr 30 23:26:41 2006 @@ -2212,6 +2212,12 @@ ['foo: ;', '"Jason R. Mastaler" <jason(a)dom.ain>']), [('', ''), ('Jason R. Mastaler', 'jason(a)dom.ain')]) + def test_getaddresses_embedded_comment(self): + """Test proper handling of a nested comment""" + eq = self.assertEqual + addrs = Utils.getaddresses(['User ((nested comment)) <foo(a)bar.com>']) + eq(addrs[0][1], 'foo(a)bar.com') + def test_utils_quote_unquote(self): eq = self.assertEqual msg = Message() Modified: python/branches/release24-maint/Lib/rfc822.py ============================================================================== --- python/branches/release24-maint/Lib/rfc822.py (original) +++ python/branches/release24-maint/Lib/rfc822.py Sun Apr 30 23:26:41 2006 @@ -711,6 +711,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/release24-maint/Lib/test/test_rfc822.py ============================================================================== --- python/branches/release24-maint/Lib/test/test_rfc822.py (original) +++ python/branches/release24-maint/Lib/test/test_rfc822.py Sun Apr 30 23:26:41 2006 @@ -45,6 +45,10 @@ print 'extra parsed address:', repr(n), repr(a) continue i = i + 1 + self.assertEqual(mn, n, + "Un-expected name: %s != %s" % (`mn`, `n`)) + self.assertEqual(ma, a, + "Un-expected address: %s != %s" % (`ma`, `a`)) if mn == n and ma == a: pass else: @@ -129,6 +133,12 @@ 'To: person(a)dom.ain (User J. Person)\n\n', [('User J. Person', 'person(a)dom.ain')]) + def test_doublecomment(self): + # The RFC allows comments within comments in an email addr + self.check( + 'To: person(a)dom.ain ((User J. Person)), John Doe <foo(a)bar.com>\n\n', + [('User J. Person', 'person(a)dom.ain'), ('John Doe', 'foo(a)bar.com')]) + def test_twisted(self): # This one is just twisted. I don't know what the proper # result should be, but it shouldn't be to infloop, which is

1 0

r45828 - python/trunk/Doc/whatsnew/whatsnew25.tex
by andrew.kuchling April 30, 2006

April 30, 2006

Author: andrew.kuchling Date: Sun Apr 30 23:19:49 2006 New Revision: 45828 Modified: python/trunk/Doc/whatsnew/whatsnew25.tex Log: Add item Modified: python/trunk/Doc/whatsnew/whatsnew25.tex ============================================================================== --- python/trunk/Doc/whatsnew/whatsnew25.tex (original) +++ python/trunk/Doc/whatsnew/whatsnew25.tex Sun Apr 30 23:19:49 2006 @@ -1468,6 +1468,12 @@ \code{sys.path}, so unless your programs explicitly added the directory to \code{sys.path}, this removal shouldn't affect your code. +\item The \module{rlcompleter} module is no longer +dependent on importing the \module{readline} module and +therefore now works on non-{\UNIX} platforms. +(Patch from Robert Kiendl.) +% Patch #1472854 + \item The \module{socket} module now supports \constant{AF_NETLINK} sockets on Linux, thanks to a patch from Philippe Biondi. Netlink sockets are a Linux-specific mechanism for communications

1 0

r45827 - python/trunk/Doc/howto/urllib2.rst
by andrew.kuchling April 30, 2006

April 30, 2006

Author: andrew.kuchling Date: Sun Apr 30 23:19:31 2006 New Revision: 45827 Added: python/trunk/Doc/howto/urllib2.rst Log: Add urllib2 HOWTO from Michael Foord Added: python/trunk/Doc/howto/urllib2.rst ============================================================================== --- (empty file) +++ python/trunk/Doc/howto/urllib2.rst Sun Apr 30 23:19:31 2006 @@ -0,0 +1,410 @@ +============================================== + HOWTO Fetch Internet Resources Using urllib2 +============================================== +------------------------------------------ + Fetching URLs With Python +------------------------------------------ + + +.. note:: + + There is an French translation of this HOWTO, available at `urllib2 - Le Manuel manquant <http://www.voidspace/python/urllib2_francais.shtml>`_. + +.. contents:: urllib2 Tutorial + + +Introduction +============ + +.. sidebar:: Related Articles + + You may also find useful the following articles on fetching web resources with Python : + + * `Basic Authentication <http://www.voidspace.org.uk/python/articles/authentication.shtml>`_ + + A tutorial on *Basic Authentication*, with exampels in Python. + + * `cookielib and ClientCookie <http://www.voidspace.org.uk/python/articles/cookielib.shtml>`_ + + How to handle cookies, when fetching web pages with Python. + + This HOWTO is written by `Michael Foord <http://www.voidspace.org.uk/python/index.shtml>`_. + +**urllib2** is a Python_ module for fetching URLs (Uniform Resource Locators). It offers a very simple interface, in the form of the *urlopen* function. This is capable of fetching URLs using a variety of different protocols. It also offers a slightly more complex interface for handling common situations - like basic authentication, cookies, proxies, and so on. These are provided by objects called handlers and openers. + +For straightforward situations *urlopen* is very easy to use. But as soon as you encounter errors, or non-trivial cases, you will need some understanding of the HyperText Transfer Protocol. The most comprehensive reference to HTTP is :RFC:`2616`. This is a technical document and not intended to be easy to read. This HOWTO aims to illustrate using *urllib2*, with enough detail about HTTP to help you through. It is not intended to replace the `urllib2 docs`_ [#]_, but is supplementary to them. + + +Fetching URLs +============= + +HTTP is based on requests and responses - the client makes requests and servers send responses. Python mirrors this by having you form a ``Request`` object which represents the request you are making. In it's simplest form you create a Request object that specifies the URL you want to fetch [#]_. Calling ``urlopen`` with this Request object returns a handle on the page requested. This handle is a file like object : :: + + import urllib2 + + the_url = 'http://www.voidspace.org.uk' + req = urllib2.Request(the_url) + handle = urllib2.urlopen(req) + the_page = handle.read() + +There are two extra things that Request objects allow you to do. Sometimes you want to **POST** data to a CGI (Common Gateway Interface) [#]_ or other web application. This is what your browser does when you fill in a FORM on the web. You may be mimicking a FORM submission, or transmitting data to your own application. In either case the data needs to be encoded for safe transmission over HTTP, and then passed to the Request object as the ``data`` argument. The encoding is done using a function from the ``urllib`` library *not* from ``urllib2``. :: + + import urllib + import urllib2 + + the_url = 'http://www.someserver.com/cgi-bin/register.cgi' + values = {'name' : 'Michael Foord', + 'location' : 'Northampton', + 'language' : 'Python' } + + data = urllib.urlencode(values) + req = urllib2.Request(the_url, data) + handle = urllib2.urlopen(req) + the_page = handle.read() + +Some websites [#]_ dislike being browsed by programs, or send different versions to different browsers [#]_ . By default urllib2 identifies itself as ``Python-urllib/2.4``, which may confuse the site, or just plain not work. The way a browser identifies itself is through the ``User-Agent`` header [#]_. When you create a Request object you can pass a dictionary of headers in. The following example makes the same request as above, but identifies itself as a version of Internet Explorer [#]_. :: + + import urllib + import urllib2 + + the_url = 'http://www.someserver.com/cgi-bin/register.cgi' + user_agent = 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT)' + values = {'name' : 'Michael Foord', + 'location' : 'Northampton', + 'language' : 'Python' } + headers = { 'User-Agent' : user_agent } + + data = urllib.urlencode(values) + req = urllib2.Request(the_url, data, headers) + handle = urllib2.urlopen(req) + the_page = handle.read() + +The handle also has two useful methods. See the section on `info and geturl`_ which comes after we have a look at what happens when things go wrong. + + +Coping With Errors +================== + +*urlopen* raises ``URLError`` or ``HTTPError`` in the event of an error. ``HTTPError`` is a subclass of ``URLError``, which is a subclass of ``IOError``. This means you can trap for ``IOError`` if you want. :: + + req = urllib2.Request(some_url) + try: + handle = urllib2.urlopen(req) + except IOError: + print 'Something went wrong' + else: + print handle.read() + +URLError +-------- + +If the request fails to reach a server then urlopen will raise a ``URLError``. This will usually be because there is no network connection (no route to the specified server), or the specified server doesn't exist. + +In this case, the exception raised will have a 'reason' attribute, which is a tuple containing an error code and a text error message. + +e.g. :: + + >>> req = urllib2.Request('http://www.pretend_server.org') + >>> try: urllib2.urlopen(req) + >>> except IOError, e: + >>> print e.reason + >>> + (4, 'getaddrinfo failed') + + +HTTPError +--------- + +If the request reaches a server, but the server is unable to fulfil the request, it returns an error code. The default handlers will hande some of these errors for you. For those it can't handle, urlopen will raise an ``HTTPError``. Typical errors include '404' (page not found), '403' (request forbidden), and '401' (authentication required). + +See http://www.w3.org/Protocols/HTTP/HTRESP.html for a reference on all the http error codes. + +The ``HTTPError`` instance raised will have an integer 'code' attribute, which corresponds to the error sent by the server. + +There is a useful dictionary of response codes in ``HTTPBaseServer``, that shows all the defined response codes. Because the default handlers handle redirects (codes in the 300 range), and codes in the 100-299 range indicate success, you will usually only see error codes in the 400-599 range. + +Error Codes +~~~~~~~~~~~ + +.. note:: + + As of Python 2.5 a dictionary like this one has become part of ``urllib2``. + +:: + + # Table mapping response codes to messages; entries have the + # form {code: (shortmessage, longmessage)}. + httpresponses = { + 100: ('Continue', 'Request received, please continue'), + 101: ('Switching Protocols', + 'Switching to new protocol; obey Upgrade header'), + + 200: ('OK', 'Request fulfilled, document follows'), + 201: ('Created', 'Document created, URL follows'), + 202: ('Accepted', + 'Request accepted, processing continues off-line'), + 203: ('Non-Authoritative Information', + 'Request fulfilled from cache'), + 204: ('No response', 'Request fulfilled, nothing follows'), + 205: ('Reset Content', 'Clear input form for further input.'), + 206: ('Partial Content', 'Partial content follows.'), + + 300: ('Multiple Choices', + 'Object has several resources -- see URI list'), + 301: ('Moved Permanently', + 'Object moved permanently -- see URI list'), + 302: ('Found', 'Object moved temporarily -- see URI list'), + 303: ('See Other', 'Object moved -- see Method and URL list'), + 304: ('Not modified', + 'Document has not changed since given time'), + 305: ('Use Proxy', + 'You must use proxy specified in Location' + ' to access this resource.'), + 307: ('Temporary Redirect', + 'Object moved temporarily -- see URI list'), + + 400: ('Bad request', + 'Bad request syntax or unsupported method'), + 401: ('Unauthorized', + 'No permission -- see authorization schemes'), + 402: ('Payment required', + 'No payment -- see charging schemes'), + 403: ('Forbidden', + 'Request forbidden -- authorization will not help'), + 404: ('Not Found', 'Nothing matches the given URI'), + 405: ('Method Not Allowed', + 'Specified method is invalid for this server.'), + 406: ('Not Acceptable', + 'URI not available in preferred format.'), + 407: ('Proxy Authentication Required', + 'You must authenticate with ' + 'this proxy before proceeding.'), + 408: ('Request Time-out', + 'Request timed out; try again later.'), + 409: ('Conflict', 'Request conflict.'), + 410: ('Gone', + 'URI no longer exists and has been permanently removed.'), + 411: ('Length Required', 'Client must specify Content-Length.'), + 412: ('Precondition Failed', + 'Precondition in headers is false.'), + 413: ('Request Entity Too Large', 'Entity is too large.'), + 414: ('Request-URI Too Long', 'URI is too long.'), + 415: ('Unsupported Media Type', + 'Entity body in unsupported format.'), + 416: ('Requested Range Not Satisfiable', + 'Cannot satisfy request range.'), + 417: ('Expectation Failed', + 'Expect condition could not be satisfied.'), + + 500: ('Internal error', 'Server got itself in trouble'), + 501: ('Not Implemented', + 'Server does not support this operation'), + 502: ('Bad Gateway', + 'Invalid responses from another server/proxy.'), + 503: ('Service temporarily overloaded', + 'The server cannot ' + 'process the request due to a high load'), + 504: ('Gateway timeout', + 'The gateway server did not receive a timely response'), + 505: ('HTTP Version not supported', 'Cannot fulfill request.'), + } + +When an error is raised the server responds by returning an http error code *and* an error page. You can use the ``HTTPError`` instance as a handle on the page returned. This means that as well as the code attribute, it also has read, geturl, and info, methods. :: + + >>> req = urllib2.Request('http://www.python.org/fish.html') + >>> try: + >>> urllib2.urlopen(req) + >>> except IOError, e: + >>> print e.code + >>> print e.read() + >>> + 404 + <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" + "http://www.w3.org/TR/html4/loose.dtd"> + <?xml-stylesheet href="./css/ht2html.css" + type="text/css"?> + <html><head><title>Error 404: File Not Found</title> + ...... etc... + +Wrapping it Up +-------------- + +So if you want to be prepared for ``HTTPError`` *or* ``URLError`` there are two +basic approaches. I prefer the second approach. + +Number 1 +~~~~~~~~ + +:: + + + from urllib2 import Request, urlopen, URLError, HTTPError + req = Request(someurl) + try: + handle = urlopen(req) + except HTTPError, e: + print 'The server couldn\'t fulfill the request.' + print 'Error code: ', e.code + except URLError, e: + print 'We failed to reach a server.' + print 'Reason: ', e.reason + else: + # everything is fine + + +.. note:: + + The ``except HTTPError`` *must* come first, otherwise ``except URLError`` will *also* catch an ``HTTPError``. + +Number 2 +~~~~~~~~ + +:: + + from urllib2 import Request, urlopen + req = Request(someurl) + try: + handle = urlopen(req) + except IOError, e: + if hasattr(e, 'reason'): + print 'We failed to reach a server.' + print 'Reason: ', e.reason + elif hasattr(e, 'code'): + print 'The server couldn\'t fulfill the request.' + print 'Error code: ', e.code + else: + # everything is fine + + +info and geturl +=============== + +The handle returned by urlopen (or the ``HTTPError`` instance) has two useful methods ``info`` and ``geturl``. + +**geturl** - this returns the real url of the page fetched. This is useful because ``urlopen`` (or the openener object used) may have followed a redirect. The url of the page fetched may not be the same as the url requested. + +**info** - this returns a dictionary like object that describes the page fetched, particularly the headers sent by the server. It is actually an ``httplib.HTTPMessage`` instance. In versions of Python prior to 2.3.4 it wasn't safe to iterate over the object directly, so you should iterate over the list returned by ``msg.keys()`` instead. + +Typical headers include 'content-length', 'content-type', and so on. See the `Quick Reference to HTTP Headers`_ for a useful reference on the different sort of headers. + + +Openers and Handlers +==================== + +Openers and handlers are slightly esoteric parts of **urllib2**. When you fetch a URL you use an opener. Normally we have been using the default opener - via ``urlopen`` - but you can create custom openers. Openers use handlers. + +``build_opener`` is used to create ``opener`` objects - for fetching URLs with specific handlers installed. Handlers can handle cookies, authentication, and other common but slightly specialised situations. Opener objects have an ``open`` method, which can be called directly to fetch urls in the same way as the ``urlopen`` function. + +``install_opener`` can be used to make an ``opener`` object the default opener. This means that calls to ``urlopen`` will use the opener you have installed. + + +Basic Authentication +==================== + +To illustrate creating and installing a handler we will use the ``HTTPBasicAuthHandler``. For a more detailed discussion of this subject - including an explanation of how Basic Authentication works - see the `Basic Authentication Tutorial`_. + +When authentication is required, the server sends a header (as well as the 401 error code) requesting authentication. This specifies the authentication scheme and a 'realm'. The header looks like : ``www-authenticate: SCHEME realm="REALM"``. + +e.g. :: + + www-authenticate: Basic realm="cPanel" + + +The client should then retry the request with the appropriate name and password for the realm included as a header in the request. This is 'basic authentication'. In order to simplify this process we can create an instance of ``HTTPBasicAuthHandler`` and an opener to use this handler. + +The ``HTTPBasicAuthHandler`` uses an object called a password manager to handle the mapping of URIs and realms to passwords and usernames. If you know what the realm is (from the authentication header sent by the server), then you can use a ``HTTPPasswordMgr``. Generally there is only one realm per URI, so it is possible to use ``HTTPPasswordMgrWithDefaultRealm``. This allows you to specify a default username and password for a URI. This will be supplied in the absence of yoou providing an alternative combination for a specific realm. We signify this by providing ``None`` as the realm argument to the ``add_password`` method. + +The toplevelurl is the first url that requires authentication. This is usually a 'super-url' of any others in the same realm. :: + + password_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm() + # create a password manager + + password_mgr.add_password(None, + top_level_url, username, password) + # add the username and password + # if we knew the realm, we could + # use it instead of ``None`` + + handler = urllib2.HTTPBasicAuthHandler(password_mgr) + # create the handler + + opener = urllib2.build_opener(handler) + # from handler to opener + + opener.open(a_url) + # use the opener to fetch a URL + + urllib2.install_opener(opener) + # install the opener + # now all calls to urllib2.urlopen use our opener + +.. note:: + + In the above example we only supplied our ``HHTPBasicAuthHandler`` to ``build_opener``. By default openers have the handlers for normal situations - ``ProxyHandler``, ``UnknownHandler``, ``HTTPHandler``, ``HTTPDefaultErrorHandler``, ``HTTPRedirectHandler``, ``FTPHandler``, ``FileHandler``, ``HTTPErrorProcessor``. The only reason to explicitly supply these to ``build_opener`` (which chains handlers provided as a list), would be to change the order they appear in the chain. + +One thing not to get bitten by is that the ``top_level_url`` in the code above *must not* contain the protocol - the ``http://`` part. So if the URL we are trying to access is ``http://www.someserver.com/path/page.html``, then we set : :: + + top_level_url = "www.someserver.com/path/page.html" + # *no* http:// !! + +It took me a long time to track that down the first time I tried to use handlers. + + +Proxies +======= + +**urllib2** will auto-detect your proxy settings and use those. This is through the ``ProxyHandler`` which is part of the normal handler chain. Normally that's a good thing, but there are occasions when it may not be helpful [#]_. In order to do this we need to setup our own ``ProxyHandler``, with no proxies defined. This is done using similar steps to setting up a `Basic Authentication`_ handler : :: + + >>> proxy_support = urllib2.ProxyHandler({}) + >>> opener = urllib2.build_opener(proxy_support) + >>> urllib2.install_opener(opener) + +.. caution:: + + Currently ``urllib2`` *does not* support fetching of ``https`` locations through + a proxy. This can be a problem. + +Sockets and Layers +================== + +The Python support for fetching resources from the web is layered. urllib2 uses the httplib library, which in turn uses the socket library. + +As of Python 2.3 you can specify how long a socket should wait for a response before timing out. This can be useful in applications which have to fetch web pages. By default the socket module has *no timeout* and can hang. To set the timeout use : :: + + import socket + import urllib2 + + timeout = 10 + # timeout in seconds + socket.setdefaulttimeout(timeout) + + req = urllib2.Request('http://www.voidspace.org.uk') + handle = urllib2.urlopen(req) + # this call to urllib2.urlopen + # now uses the default timeout + # we have set in the socket module + + +------- + + +Footnotes +=========== + +.. [#] Possibly some of this tutorial will make it into the standard library docs for versions of Python after 2.4.1. +.. [#] You *can* fetch URLs directly with urlopen, without using a request object. It's more explicit, and therefore more Pythonic, to use ``urllib2.Request`` though. It also makes it easier to add headers to your request. +.. [#] For an introduction to the CGI protocol see `Writing Web Applications in Python`_. +.. [#] Like Google for example. The *proper* way to use google from a program is to use PyGoogle_ of course. See `Voidspace Google`_ for some examples of using the Google API. +.. [#] Browser sniffing is a very bad practise for website design - building sites using web standards is much more sensible. Unfortunately a lot of sites still send different versions to different browsers. +.. [#] The user agent for MSIE 6 is *'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)'* +.. [#] For details of more HTTP request headers, see `Quick Reference to HTTP Headers`_. + +.. [#] In my case I have to use a proxy to access the internet at work. If you attempt to fetch *localhost* URLs through this proxy it blocks them. IE is set to use the proxy, which urllib2 picks up on. In order to test scripts with a localhost server, I have to prevent urllib2 from using the proxy. + +.. _Python: http://www.python.org +.. _urllib2 docs: http://docs.python.org/lib/module-urllib2.html +.. _Quick Reference to HTTP Headers: http://www.cs.tut.fi/~jkorpela/http.html +.. _PyGoogle: http://pygoogle.sourceforge.net +.. _Voidspace Google: http://www.voidspace.org.uk/python/recipebook.shtml#google +.. _Writing Web Applications in Python: http://www.pyzine.com/Issue008/Section_Articles/article_CGIOne.html +.. _Basic Authentication Tutorial: http://www.voidspace.org.uk/python/articles/authentication.shtml \ No newline at end of file

1 0

r45826 - python/trunk/Doc/ref/ref3.tex python/trunk/Doc/ref/ref7.tex
by georg.brandl April 30, 2006

April 30, 2006

Author: georg.brandl Date: Sun Apr 30 21:34:19 2006 New Revision: 45826 Modified: python/trunk/Doc/ref/ref3.tex python/trunk/Doc/ref/ref7.tex Log: Patch #1479438: add \keyword markup for "with". Modified: python/trunk/Doc/ref/ref3.tex ============================================================================== --- python/trunk/Doc/ref/ref3.tex (original) +++ python/trunk/Doc/ref/ref3.tex Sun Apr 30 21:34:19 2006 @@ -2149,9 +2149,9 @@ than writing individual \method{__enter__()} and \method{__exit__()} methods on a separate object when the state to be managed is complex. -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}). +\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} Modified: python/trunk/Doc/ref/ref7.tex ============================================================================== --- python/trunk/Doc/ref/ref7.tex (original) +++ python/trunk/Doc/ref/ref7.tex Sun Apr 30 21:34:19 2006 @@ -315,7 +315,7 @@ \versionadded{2.5} The \keyword{with} statement is used to wrap the execution of a block -with methods defined by a context manager or with statement context +with methods defined by a context manager or \keyword{with} statement context object (see section~\ref{context-managers}). This allows common \keyword{try}...\keyword{except}...\keyword{finally} usage patterns to be encapsulated for convenient reuse. @@ -332,7 +332,7 @@ \item The context expression is evaluated, to obtain a context manager. \item The context manger's \method{__context__()} method is -invoked to obtain a with statement context object. +invoked to obtain a \keyword{with} statement context object. \item The context object's \method{__enter__()} method is invoked.

1 0

buildbot warnings in amd64 gentoo trunk
by buildbot＠python.org April 30, 2006

April 30, 2006

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/693 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

1 0

r45825 - in python/trunk: Doc/lib/librlcompleter.tex Lib/rlcompleter.py Lib/test/test_sundry.py Misc/NEWS
by georg.brandl April 30, 2006

April 30, 2006

Author: georg.brandl Date: Sun Apr 30 20:14:54 2006 New Revision: 45825 Modified: python/trunk/Doc/lib/librlcompleter.tex python/trunk/Lib/rlcompleter.py python/trunk/Lib/test/test_sundry.py python/trunk/Misc/NEWS Log: Patch #1472854: make the rlcompleter.Completer class usable on non- UNIX platforms. Modified: python/trunk/Doc/lib/librlcompleter.tex ============================================================================== --- python/trunk/Doc/lib/librlcompleter.tex (original) +++ python/trunk/Doc/lib/librlcompleter.tex Sun Apr 30 20:14:54 2006 @@ -2,18 +2,17 @@ Completion function for GNU readline} \declaremodule{standard}{rlcompleter} - \platform{Unix} \sectionauthor{Moshe Zadka}{moshez(a)zadka.site.co.il} -\modulesynopsis{Python identifier completion for the GNU readline library.} +\modulesynopsis{Python identifier completion, suitable for the GNU readline library.} -The \module{rlcompleter} module defines a completion function for +The \module{rlcompleter} module defines a completion function suitable for the \refmodule{readline} module by completing valid Python identifiers and keywords. -This module is \UNIX-specific due to its dependence on the -\refmodule{readline} module. - -The \module{rlcompleter} module defines the \class{Completer} class. +When this module is imported on a \UNIX\ platform with the \module{readline} +module available, an instance of the \class{Completer} class is automatically +created and its \method{complete} method is set as the \module{readline} +completer. Example: @@ -44,6 +43,9 @@ \end{verbatim} +On platforms without \module{readline}, the \class{Completer} class defined +by this module can still be used for custom purposes. + \subsection{Completer Objects \label{completer-objects}} Completer objects have the following method: Modified: python/trunk/Lib/rlcompleter.py ============================================================================== --- python/trunk/Lib/rlcompleter.py (original) +++ python/trunk/Lib/rlcompleter.py Sun Apr 30 20:14:54 2006 @@ -39,7 +39,6 @@ """ -import readline import __builtin__ import __main__ @@ -147,4 +146,9 @@ ret = ret + get_class_members(base) return ret -readline.set_completer(Completer().complete) +try: + import readline +except ImportError: + pass +else: + readline.set_completer(Completer().complete) Modified: python/trunk/Lib/test/test_sundry.py ============================================================================== --- python/trunk/Lib/test/test_sundry.py (original) +++ python/trunk/Lib/test/test_sundry.py Sun Apr 30 20:14:54 2006 @@ -50,11 +50,7 @@ import py_compile import pydoc import rexec -try: - import rlcompleter # not available on Windows -except ImportError: - if verbose: - print "skipping rlcompleter" +import rlcompleter import sched import smtplib import sndhdr Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sun Apr 30 20:14:54 2006 @@ -86,6 +86,9 @@ Library ------- +- Patch #1472854: make the rlcompleter.Completer class usable on non- + UNIX platforms. + - Patch #1470846: fix urllib2 ProxyBasicAuthHandler. - Patch #1475231: ``doctest`` has a new ``SKIP`` option, which causes

1 0