Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

merge heads

This commit is contained in:
Benjamin Peterson 2011-06-19 19:48:38 -05:00
parent f5ff22329b bd4c321a3f
commit 4092e68396
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Doc/library/http.client.rst
View File

@ -543,6 +543,9 @@ statement.
A debugging hook. If :attr:`debuglevel` is greater than zero, messages A debugging hook. If :attr:`debuglevel` is greater than zero, messages
will be printed to stdout as the response is read and parsed. will be printed to stdout as the response is read and parsed.
.. attribute:: HTTPResponse.closed
Is True if the stream is closed.
Examples Examples
-------- --------
@ -555,7 +558,15 @@ Here is an example session that uses the ``GET`` method::
>>> r1 = conn.getresponse() >>> r1 = conn.getresponse()
>>> print(r1.status, r1.reason) >>> print(r1.status, r1.reason)
200 OK 200 OK
>>> data1 = r1.read() >>> data1 = r1.read() # This will return entire content.
>>> # The following example demonstrates reading data in chunks.
>>> conn.request("GET", "/index.html")
>>> r1 = conn.getresponse()
>>> while not r1.closed:
... print(r1.read(200)) # 200 bytes
b'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
...
>>> # Example of an invalid request
>>> conn.request("GET", "/parrot.spam") >>> conn.request("GET", "/parrot.spam")
>>> r2 = conn.getresponse() >>> r2 = conn.getresponse()
>>> print(r2.status, r2.reason) >>> print(r2.status, r2.reason)

15
Doc/tutorial/modules.rst
View File

@ -159,13 +159,14 @@ The Module Search Path
.. index:: triple: module; search; path .. index:: triple: module; search; path
When a module named :mod:`spam` is imported, the interpreter searches for a file When a module named :mod:`spam` is imported, the interpreter searches for a
named :file:`spam.py` in the current directory, and then in the list of file named :file:`spam.py` in the directory containing the input script (or
directories specified by the environment variable :envvar:`PYTHONPATH`. This the current directory), and then in the list of directories specified by the
has the same syntax as the shell variable :envvar:`PATH`, that is, a list of environment variable :envvar:`PYTHONPATH`. This has the same syntax as the
directory names. When :envvar:`PYTHONPATH` is not set, or when the file is not shell variable :envvar:`PATH`, that is, a list of directory names. When
found there, the search continues in an installation-dependent default path; on :envvar:`PYTHONPATH` is not set, or when the file is not found there, the
Unix, this is usually :file:`.:/usr/local/lib/python`. search continues in an installation-dependent default path; on Unix, this is
usually :file:`.:/usr/local/lib/python`.
Actually, modules are searched in the list of directories given by the variable Actually, modules are searched in the list of directories given by the variable
``sys.path`` which is initialized from the directory containing the input script ``sys.path`` which is initialized from the directory containing the input script