mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 23:53:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

typos, layout and other small things

Browse source
This commit is contained in:
Guido van Rossum 1995-04-10 11:34:00 +00:00
parent eae3f73b1c
commit 96628a90c4
44 changed files with 174 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/boilerplate.tex
View file

@ -5,4 +5,4 @@
E-mail: {\tt guido@cwi.nl} E-mail: {\tt guido@cwi.nl}
} }
\date{28 March 1995 \\ Release 1.2-proof-3} % XXX update before release! \date{10 April 1995 \\ Release 1.2} % XXX update before release!

2
Doc/info/texipre.dat
View file

@ -77,7 +77,7 @@ the language, see the @cite{Python Tutorial}. The @cite{Python
Reference Manual} gives a more formal definition of the language. Reference Manual} gives a more formal definition of the language.
(These manuals are not yet available in INFO or Texinfo format.) (These manuals are not yet available in INFO or Texinfo format.)
This version corresponds to Python version 1.2. This version corresponds to Python version 1.2 (4 April 1995).
@end ifinfo @end ifinfo

7
Doc/lib/libdbm.tex
View file

@ -18,7 +18,8 @@ raised for general mapping errors like specifying an incorrect key.
\begin{funcdesc}{open}{filename\, rwmode\, filemode} \begin{funcdesc}{open}{filename\, rwmode\, filemode}
Open a dbm database and return a mapping object. \var{filename} is Open a dbm database and return a mapping object. \var{filename} is
the name of the database file (without the \file{.dir} or \file{.pag} the name of the database file (without the \file{.dir} or \file{.pag}
extensions), \var{rwmode} is \code{'r'}, \code{'w'} or \code{'rw'} as for extensions), \var{rwmode} is \code{'r'}, \code{'w'} or \code{'rw'} to
\code{open}, and \var{filemode} is the \UNIX{} mode of the file, used only open the database fore reading, writing or both respectively,
when the database has to be created. and \var{filemode} is the \UNIX{} mode of the file, used only
when the database has to be created (but to be supplied at all times).
\end{funcdesc} \end{funcdesc}

2
Doc/lib/libftplib.tex
View file

@ -16,7 +16,7 @@ Here's a sample session using the \code{ftplib} module:
\begin{verbatim} \begin{verbatim}
>>> from ftplib import FTP >>> from ftplib import FTP
>>> ftp = FTP('ftp.cwi.nl') # connect to host, default port >>> ftp = FTP('ftp.cwi.nl') # connect to host, default port
>>> ftp.login() # default user anonymous, passwd user@hostname >>> ftp.login() # user anonymous, passwd user@hostname
>>> ftp.retrlines('LIST') # list directory contents >>> ftp.retrlines('LIST') # list directory contents
total 24418 total 24418
drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 . drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 .

13
Doc/lib/libgdbm.tex
View file

@ -18,13 +18,14 @@ raised for general mapping errors like specifying an incorrect key.
\end{excdesc} \end{excdesc}
\begin{funcdesc}{open}{filename\, rwmode\, filemode} \begin{funcdesc}{open}{filename\, rwmode\, filemode}
Open a gdbm database and return a mapping object. \var{filename} is Open a gdbm database and return a mapping object. \var{filename} is
the name of the database file, \var{rwmode} is \code{'r'}, \code{'w'}, the name of the database file, \var{rwmode} is \code{'r'}, \code{'w'},
\code{'c'}, or \code{'n'} for reader, writer (this also gives read \code{'c'}, or \code{'n'} for reader, writer (this also gives read
access), create (writer, but create the database if it doesn't already access), create (writer, but create the database if it doesn't already
exist) and newdb (which will always create a new database). Only one exist) and newdb (which will always create a new database). Only one
writer may open a gdbm file and many readers may open the file. Readers writer may open a gdbm file and many readers may open the file. Readers
and writers cannot open the gdbm file at the same time. Note that the and writers cannot open the gdbm file at the same time. Note that the
\code{GDBM_FAST} mode of opening the database is not supported. \var{filemode} \code{GDBM_FAST} mode of opening the database is not supported.
is the \UNIX\ mode of the file, used only when a database is created. \var{filemode} is the \UNIX\ mode of the file, used only when a
database is created (but to be supplied at all times).
\end{funcdesc} \end{funcdesc}

2
Doc/lib/libimp.tex
View file

@ -142,7 +142,7 @@ def __import__(name, globals=None, locals=None, fromlist=None):
return sys.modules[name] return sys.modules[name]
# If any of the following calls raises an exception, # If any of the following calls raises an exception,
# there's a problem we con't handle -- let the caller handle it. # there's a problem we can't handle -- let the caller handle it.
# See if it's a built-in module. # See if it's a built-in module.
m = imp.init_builtin(name) m = imp.init_builtin(name)

2
Doc/lib/libjpeg.tex
View file

@ -14,7 +14,7 @@ The \code{jpeg} module defines these functions:
Treat data as a pixmap of width \var{w} and height \var{h}, with \var{b} bytes per Treat data as a pixmap of width \var{w} and height \var{h}, with \var{b} bytes per
pixel. The data is in SGI GL order, so the first pixel is in the pixel. The data is in SGI GL order, so the first pixel is in the
lower-left corner. This means that \code{lrectread} return data can lower-left corner. This means that \code{lrectread} return data can
immedeately be passed to compress. Currently only 1 byte and 4 byte immediately be passed to compress. Currently only 1 byte and 4 byte
pixels are allowed, the former being treated as greyscale and the pixels are allowed, the former being treated as greyscale and the
latter as RGB color. Compress returns a string that contains the latter as RGB color. Compress returns a string that contains the
compressed picture, in JFIF format. compressed picture, in JFIF format.

2
Doc/lib/libnntplib.tex
View file

@ -12,6 +12,7 @@ Here are two small examples of how it can be used. To list some
statistics about a newsgroup and print the subjects of the last 10 statistics about a newsgroup and print the subjects of the last 10
articles: articles:
\small{
\begin{verbatim} \begin{verbatim}
>>> s = NNTP('news.cwi.nl') >>> s = NNTP('news.cwi.nl')
>>> resp, count, first, last, name = s.group('comp.lang.python') >>> resp, count, first, last, name = s.group('comp.lang.python')
@ -34,6 +35,7 @@ Group comp.lang.python has 59 articles, range 3742 to 3803
'205 news.cwi.nl closing connection. Goodbye.' '205 news.cwi.nl closing connection. Goodbye.'
>>> >>>
\end{verbatim} \end{verbatim}
}
To post an article from a file (this assumes that the article has To post an article from a file (this assumes that the article has
valid headers): valid headers):

2
Doc/lib/libpickle.tex
View file

@ -146,7 +146,7 @@ To unpickle an object \code{x} from a file \code{f}, open for reading:
\begin{verbatim} \begin{verbatim}
u = pickle.Unpickler(f) u = pickle.Unpickler(f)
x = u.load(x) x = u.load()
\end{verbatim} \end{verbatim}
A shorthand is: A shorthand is:

5
Doc/lib/libposix.tex
View file

@ -16,7 +16,8 @@ through the \code{os} interface. Once \code{os} is imported, there is
\stmodindex{os} \stmodindex{os}
The descriptions below are very terse; refer to the The descriptions below are very terse; refer to the
corresponding \UNIX{} manual entry for more information. corresponding \UNIX{} manual entry for more information. Arguments
called \var{path} refer to a pathname given as a string.
Errors are reported as exceptions; the usual exceptions are given Errors are reported as exceptions; the usual exceptions are given
for type errors, while errors reported by the system calls raise for type errors, while errors reported by the system calls raise
@ -340,7 +341,7 @@ Wait for completion of a child process given by proces id, and return
a tuple containing its pid and exit status indication (encoded as by a tuple containing its pid and exit status indication (encoded as by
\UNIX{}). The semantics of the call are affected by the value of \UNIX{}). The semantics of the call are affected by the value of
the integer options, which should be 0 for normal operation. (If the the integer options, which should be 0 for normal operation. (If the
system does not support waitpid(), this always raises system does not support \code{waitpid()}, this always raises
\code{posix.error}. Not on MS-DOS.) \code{posix.error}. Not on MS-DOS.)
\end{funcdesc} \end{funcdesc}

5
Doc/lib/libposixfile.tex
View file

@ -63,11 +63,12 @@ The posixfile object defines the following additional methods:
manual page on your system. manual page on your system.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{flags}{fmt} \begin{funcdesc}{flags}{\optional{flags}}
Set the specified flags for the file that the file object is referring Set the specified flags for the file that the file object is referring
to. The new flags are ORed with the old flags, unless specified to. The new flags are ORed with the old flags, unless specified
otherwise. The format is explained below in a table. Without otherwise. The format is explained below in a table. Without
arguments a string indicating the current flags is returned (this is the \var{flags} argument
a string indicating the current flags is returned (this is
the same as the '?' modifier). For more information about the flags the same as the '?' modifier). For more information about the flags
refer to the fcntl manual page on your system. refer to the fcntl manual page on your system.
\end{funcdesc} \end{funcdesc}

20
Doc/lib/libprofile.tex
View file

@ -267,17 +267,19 @@ function automatically prints a simple profiling report, sorted by the
standard name string (file/line/function-name) that is presented in standard name string (file/line/function-name) that is presented in
each line. The following is a typical output from such a call: each line. The following is a typical output from such a call:
\small{
\begin{verbatim} \begin{verbatim}
main() main()
2706 function calls (2004 primitive calls) in 4.504 CPU seconds 2706 function calls (2004 primitive calls) in 4.504 CPU seconds
Ordered by: standard name Ordered by: standard name
ncalls tottime percall cumtime percall filename:lineno(function) ncalls tottime percall cumtime percall filename:lineno(function)
2 0.006 0.003 0.953 0.477 pobject.py:75(save_objects) 2 0.006 0.003 0.953 0.477 pobject.py:75(save_objects)
43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate)
... ...
\end{verbatim} \end{verbatim}
}
The first line indicates that this profile was generated by the call:\\ The first line indicates that this profile was generated by the call:\\
\code{profile.run('main()')}, and hence the exec'ed string is \code{profile.run('main()')}, and hence the exec'ed string is
@ -318,6 +320,7 @@ then the latter is the number of primitive calls, and the former is
the actual number of calls. Note that when the function does not the actual number of calls. Note that when the function does not
recurse, these two values are the same, and only the single figure is recurse, these two values are the same, and only the single figure is
printed. printed.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{pstats.Stats}{filename\optional{\, ...}} \begin{funcdesc}{pstats.Stats}{filename\optional{\, ...}}
@ -480,7 +483,8 @@ return the instance that is being processed, so that the commands can
be strung together. For example: be strung together. For example:
\begin{verbatim} \begin{verbatim}
pstats.Stats('foofile').strip_dirs().sort_stats('cum').print_stats().ignore() pstats.Stats('foofile').strip_dirs().sort_stats('cum') \
.print_stats().ignore()
\end{verbatim} \end{verbatim}
would perform all the indicated functions, but it would not return would perform all the indicated functions, but it would not return

2
Doc/lib/libstring.tex
View file

@ -70,7 +70,7 @@ string (after stripping the sign): \samp{0x} or \samp{0X} means 16,
\samp{0} means 8, anything else means 10. If \var{base} is 16, a \samp{0} means 8, anything else means 10. If \var{base} is 16, a
leading \samp{0x} or \samp{0X} is always accepted. (Note: for a more leading \samp{0x} or \samp{0X} is always accepted. (Note: for a more
flexible interpretation of numeric literals, use the built-in function flexible interpretation of numeric literals, use the built-in function
\code{eval()}. \code{eval()}.)
\bifuncindex{eval} \bifuncindex{eval}
\end{funcdesc} \end{funcdesc}

2
Doc/lib/libsun.tex
View file

@ -97,7 +97,7 @@ possibly modified by the program.
\begin{funcdesc}{write}{samples} \begin{funcdesc}{write}{samples}
Write is passed a python string containing audio samples to be played. Write is passed a python string containing audio samples to be played.
If there is enough buffer space free it will immedeately return, If there is enough buffer space free it will immediately return,
otherwise it will block. otherwise it will block.
\end{funcdesc} \end{funcdesc}

2
Doc/lib/libthread.tex
View file

@ -58,7 +58,7 @@ another thread is created.
Lock objects have the following methods: Lock objects have the following methods:
\renewcommand{\indexsubitem}{(lock method)} \renewcommand{\indexsubitem}{(lock method)}
\begin{funcdesc}{acquire}{waitflag} \begin{funcdesc}{acquire}{\optional{waitflag}}
Without the optional argument, this method acquires the lock Without the optional argument, this method acquires the lock
unconditionally, if necessary waiting until it is released by another unconditionally, if necessary waiting until it is released by another
thread (only one thread at a time can acquire a lock --- that's their thread (only one thread at a time can acquire a lock --- that's their

2
Doc/lib/libtypes.tex
View file

@ -305,7 +305,7 @@ operations. The \samp{+} and \samp{*} operations have the same
priority as the corresponding numeric operations.\footnote{They must priority as the corresponding numeric operations.\footnote{They must
have since the parser can't tell the type of the operands.} have since the parser can't tell the type of the operands.}
This table lists the sequece operations sorted in ascending priority This table lists the sequence operations sorted in ascending priority
(operations in the same box have the same priority). In the table, (operations in the same box have the same priority). In the table,
\var{s} and \var{t} are sequences of the same type; \var{n}, \var{i} \var{s} and \var{t} are sequences of the same type; \var{n}, \var{i}
and \var{j} are integers: and \var{j} are integers:

24
Doc/lib/liburlparse.tex
View file

@ -33,9 +33,16 @@ except for a leading slash in the \var{path} component, which is
retained if present. retained if present.
Example: Example:
\code{urlparse('http://www.cwi.nl:80/\%7eguido/Python.html')}
\begin{verbatim}
urlparse('http://www.cwi.nl:80/%7Eguido/Python.html')
\end{verbatim}
yields the tuple yields the tuple
\code{('http', 'www.cwi.nl:80', '/\%7eguido/Python.html', '', '', '')}.
\begin{verbatim}
('http', 'www.cwi.nl:80', '/%7Eguido/Python.html', '', '', '')
\end{verbatim}
If the \var{default_scheme} argument is specified, it gives the If the \var{default_scheme} argument is specified, it gives the
default addressing scheme, to be used only if the URL string does not default addressing scheme, to be used only if the URL string does not
@ -61,9 +68,16 @@ the network location and (part of) the path, to provide missing
components in the relative URL. components in the relative URL.
Example: Example:
\code{urljoin('http://www.cwi.nl/\%7eguido/Python.html',}
\code{'FAQ.html')} yields the string \begin{verbatim}
\code{'http://www.cwi.nl/\%7eguido/FAQ.html'}. urljoin('http://www.cwi.nl/%7Eguido/Python.html', 'FAQ.html')
\end{verbatim}
yields the string
\begin{verbatim}
'http://www.cwi.nl/%7Eguido/FAQ.html'
\end{verbatim}
The \var{allow_fragments} argument has the same meaning as for The \var{allow_fragments} argument has the same meaning as for
\code{urlparse}. \code{urlparse}.

2
Doc/libctb.tex
View file

@ -4,7 +4,7 @@
This module provides a partial interface to the Macintosh This module provides a partial interface to the Macintosh
Communications Toolbox. Currently, only Connection Manager tools are Communications Toolbox. Currently, only Connection Manager tools are
supported. supported. It may not be available in all Mac Python versions.
\begin{datadesc}{error} \begin{datadesc}{error}
The exception raised on errors. The exception raised on errors.

7
Doc/libdbm.tex
View file

@ -18,7 +18,8 @@ raised for general mapping errors like specifying an incorrect key.
\begin{funcdesc}{open}{filename\, rwmode\, filemode} \begin{funcdesc}{open}{filename\, rwmode\, filemode}
Open a dbm database and return a mapping object. \var{filename} is Open a dbm database and return a mapping object. \var{filename} is
the name of the database file (without the \file{.dir} or \file{.pag} the name of the database file (without the \file{.dir} or \file{.pag}
extensions), \var{rwmode} is \code{'r'}, \code{'w'} or \code{'rw'} as for extensions), \var{rwmode} is \code{'r'}, \code{'w'} or \code{'rw'} to
\code{open}, and \var{filemode} is the \UNIX{} mode of the file, used only open the database fore reading, writing or both respectively,
when the database has to be created. and \var{filemode} is the \UNIX{} mode of the file, used only
when the database has to be created (but to be supplied at all times).
\end{funcdesc} \end{funcdesc}

2
Doc/libftplib.tex
View file

@ -16,7 +16,7 @@ Here's a sample session using the \code{ftplib} module:
\begin{verbatim} \begin{verbatim}
>>> from ftplib import FTP >>> from ftplib import FTP
>>> ftp = FTP('ftp.cwi.nl') # connect to host, default port >>> ftp = FTP('ftp.cwi.nl') # connect to host, default port
>>> ftp.login() # default user anonymous, passwd user@hostname >>> ftp.login() # user anonymous, passwd user@hostname
>>> ftp.retrlines('LIST') # list directory contents >>> ftp.retrlines('LIST') # list directory contents
total 24418 total 24418
drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 . drwxrwsr-x 5 ftp-usr pdmaint 1536 Mar 20 09:48 .

13
Doc/libgdbm.tex
View file

@ -18,13 +18,14 @@ raised for general mapping errors like specifying an incorrect key.
\end{excdesc} \end{excdesc}
\begin{funcdesc}{open}{filename\, rwmode\, filemode} \begin{funcdesc}{open}{filename\, rwmode\, filemode}
Open a gdbm database and return a mapping object. \var{filename} is Open a gdbm database and return a mapping object. \var{filename} is
the name of the database file, \var{rwmode} is \code{'r'}, \code{'w'}, the name of the database file, \var{rwmode} is \code{'r'}, \code{'w'},
\code{'c'}, or \code{'n'} for reader, writer (this also gives read \code{'c'}, or \code{'n'} for reader, writer (this also gives read
access), create (writer, but create the database if it doesn't already access), create (writer, but create the database if it doesn't already
exist) and newdb (which will always create a new database). Only one exist) and newdb (which will always create a new database). Only one
writer may open a gdbm file and many readers may open the file. Readers writer may open a gdbm file and many readers may open the file. Readers
and writers cannot open the gdbm file at the same time. Note that the and writers cannot open the gdbm file at the same time. Note that the
\code{GDBM_FAST} mode of opening the database is not supported. \var{filemode} \code{GDBM_FAST} mode of opening the database is not supported.
is the \UNIX\ mode of the file, used only when a database is created. \var{filemode} is the \UNIX\ mode of the file, used only when a
database is created (but to be supplied at all times).
\end{funcdesc} \end{funcdesc}

2
Doc/libimp.tex
View file

@ -142,7 +142,7 @@ def __import__(name, globals=None, locals=None, fromlist=None):
return sys.modules[name] return sys.modules[name]
# If any of the following calls raises an exception, # If any of the following calls raises an exception,
# there's a problem we con't handle -- let the caller handle it. # there's a problem we can't handle -- let the caller handle it.
# See if it's a built-in module. # See if it's a built-in module.
m = imp.init_builtin(name) m = imp.init_builtin(name)

2
Doc/libjpeg.tex
View file

@ -14,7 +14,7 @@ The \code{jpeg} module defines these functions:
Treat data as a pixmap of width \var{w} and height \var{h}, with \var{b} bytes per Treat data as a pixmap of width \var{w} and height \var{h}, with \var{b} bytes per
pixel. The data is in SGI GL order, so the first pixel is in the pixel. The data is in SGI GL order, so the first pixel is in the
lower-left corner. This means that \code{lrectread} return data can lower-left corner. This means that \code{lrectread} return data can
immedeately be passed to compress. Currently only 1 byte and 4 byte immediately be passed to compress. Currently only 1 byte and 4 byte
pixels are allowed, the former being treated as greyscale and the pixels are allowed, the former being treated as greyscale and the
latter as RGB color. Compress returns a string that contains the latter as RGB color. Compress returns a string that contains the
compressed picture, in JFIF format. compressed picture, in JFIF format.

39
Doc/libmacdnr.tex
View file

@ -3,57 +3,58 @@
\bimodindex{macdnr} \bimodindex{macdnr}
This module provides an interface to the Macintosh Domain Name This module provides an interface to the Macintosh Domain Name
Resolver. It is usually used in conjunction with the \var{mactcp} module, to Resolver. It is usually used in conjunction with the \var{mactcp}
map hostnames to IP-addresses. module, to map hostnames to IP-addresses. It may not be available in
all Mac Python versions.
The \code{macdnr} module defines the following functions: The \code{macdnr} module defines the following functions:
\renewcommand{\indexsubitem}{(in module macdnr)} \renewcommand{\indexsubitem}{(in module macdnr)}
\begin{funcdesc}{Open}{\optional{filename}} \begin{funcdesc}{Open}{\optional{filename}}
Open the domain name resolver extension. If \var{filename} is given it Open the domain name resolver extension. If \var{filename} is given it
should be the pathname of the extension, otherwise a default is should be the pathname of the extension, otherwise a default is
used. Normally, this call is not needed since the other calls will used. Normally, this call is not needed since the other calls will
open the extension automatically. open the extension automatically.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{Close}{} \begin{funcdesc}{Close}{}
Close the resolver extension. Again, not needed for normal use. Close the resolver extension. Again, not needed for normal use.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{StrToAddr}{hostname} \begin{funcdesc}{StrToAddr}{hostname}
Look up the IP address for \var{hostname}. This call returns a dnr Look up the IP address for \var{hostname}. This call returns a dnr
result object of the ``address'' variation. result object of the ``address'' variation.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{AddrToName}{addr} \begin{funcdesc}{AddrToName}{addr}
Do a reverse lookup on the 32-bit integer IP-address Do a reverse lookup on the 32-bit integer IP-address
\var{addr}. Returns a dnr result object of the ``address'' variation. \var{addr}. Returns a dnr result object of the ``address'' variation.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{AddrToStr}{addr} \begin{funcdesc}{AddrToStr}{addr}
Convert the 32-bit integer IP-address \var{addr} to a dotted-decimal Convert the 32-bit integer IP-address \var{addr} to a dotted-decimal
string. Returns the string. string. Returns the string.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{HInfo}{hostname} \begin{funcdesc}{HInfo}{hostname}
Query the nameservers for a \code{HInfo} record for host Query the nameservers for a \code{HInfo} record for host
\var{hostname}. These records contain hardware and software \var{hostname}. These records contain hardware and software
information about the machine in question (if they are available in information about the machine in question (if they are available in
the first place). Returns a dnr result object of the ``hinfo'' the first place). Returns a dnr result object of the ``hinfo''
variety. variety.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{MXInfo}{domain} \begin{funcdesc}{MXInfo}{domain}
Query the nameservers for a mail exchanger for \var{domain}. This is Query the nameservers for a mail exchanger for \var{domain}. This is
the hostname of a host willing to accept SMTP mail for the given the hostname of a host willing to accept SMTP mail for the given
domain. Returns a dnr result object of the ``mx'' variety. domain. Returns a dnr result object of the ``mx'' variety.
\end{funcdesc} \end{funcdesc}
\subsection{dnr result object} \subsection{dnr result object}
Since the DNR calls all execute asynchronously you do not get the Since the DNR calls all execute asynchronously you do not get the
results back immedeately. In stead, you get a dnr result object. You results back immediately. Instead, you get a dnr result object. You
can check this object to see whether the query is complete, and access can check this object to see whether the query is complete, and access
its attributes to obtain the information when it is. its attributes to obtain the information when it is.
@ -89,23 +90,23 @@ The canonical name of the host that was queried.
\dataline{ip1} \dataline{ip1}
\dataline{ip2} \dataline{ip2}
\dataline{ip3} \dataline{ip3}
At most four integer IP addresses for this host. Unused entries are At most four integer IP addresses for this host. Unused entries are
zero. Valid only for address queries. zero. Valid only for address queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{cpuType} \begin{datadesc}{cpuType}
\dataline{osType} \dataline{osType}
Textual strings giving the machine type an OS name. Valid for hinfo Textual strings giving the machine type an OS name. Valid for hinfo
queries. queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{exchange} \begin{datadesc}{exchange}
The name of a mail-exchanger host. Valid for mx queries. The name of a mail-exchanger host. Valid for mx queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{preference} \begin{datadesc}{preference}
The preference of this mx record. Not too useful, since the Macintosh The preference of this mx record. Not too useful, since the Macintosh
will only return a single mx record. Mx queries only. will only return a single mx record. Mx queries only.
\end{datadesc} \end{datadesc}
The simplest way to use the module to convert names to dotted-decimal The simplest way to use the module to convert names to dotted-decimal

3
Doc/libmacspeech.tex
View file

@ -7,7 +7,8 @@ This module provides an interface to the Macintosh Speech Manager,
allowing you to let the Macintosh utter phrases. You need a version of allowing you to let the Macintosh utter phrases. You need a version of
the speech manager extension (version 1 and 2 have been tested) in the speech manager extension (version 1 and 2 have been tested) in
your \code{Extensions} folder for this to work. The module does not your \code{Extensions} folder for this to work. The module does not
provide full access to all features of the Speech Manager yet. provide full access to all features of the Speech Manager yet. It may
not be available in all Mac Python versions.
\begin{funcdesc}{Available}{} \begin{funcdesc}{Available}{}
Test availability of the Speech Manager extension (and, on the Test availability of the Speech Manager extension (and, on the

3
Doc/libmactcp.tex
View file

@ -8,7 +8,8 @@ MacTCP\@. There is an accompanying module \code{macdnr} which provides an
interface to the name-server (allowing you to translate hostnames to interface to the name-server (allowing you to translate hostnames to
ip-addresses), a module \code{MACTCP} which has symbolic names for ip-addresses), a module \code{MACTCP} which has symbolic names for
constants constants used by MacTCP and a wrapper module \code{socket} constants constants used by MacTCP and a wrapper module \code{socket}
which mimics the \UNIX{} socket interface (as far as possible). which mimics the \UNIX{} socket interface (as far as possible). It may
not be available in all Mac Python versions.
A complete description of the MacTCP interface can be found in the A complete description of the MacTCP interface can be found in the
Apple MacTCP API documentation. Apple MacTCP API documentation.

2
Doc/libnntplib.tex
View file

@ -12,6 +12,7 @@ Here are two small examples of how it can be used. To list some
statistics about a newsgroup and print the subjects of the last 10 statistics about a newsgroup and print the subjects of the last 10
articles: articles:
\small{
\begin{verbatim} \begin{verbatim}
>>> s = NNTP('news.cwi.nl') >>> s = NNTP('news.cwi.nl')
>>> resp, count, first, last, name = s.group('comp.lang.python') >>> resp, count, first, last, name = s.group('comp.lang.python')
@ -34,6 +35,7 @@ Group comp.lang.python has 59 articles, range 3742 to 3803
'205 news.cwi.nl closing connection. Goodbye.' '205 news.cwi.nl closing connection. Goodbye.'
>>> >>>
\end{verbatim} \end{verbatim}
}
To post an article from a file (this assumes that the article has To post an article from a file (this assumes that the article has
valid headers): valid headers):

2
Doc/libpickle.tex
View file

@ -146,7 +146,7 @@ To unpickle an object \code{x} from a file \code{f}, open for reading:
\begin{verbatim} \begin{verbatim}
u = pickle.Unpickler(f) u = pickle.Unpickler(f)
x = u.load(x) x = u.load()
\end{verbatim} \end{verbatim}
A shorthand is: A shorthand is:

5
Doc/libposix.tex
View file

@ -16,7 +16,8 @@ through the \code{os} interface. Once \code{os} is imported, there is
\stmodindex{os} \stmodindex{os}
The descriptions below are very terse; refer to the The descriptions below are very terse; refer to the
corresponding \UNIX{} manual entry for more information. corresponding \UNIX{} manual entry for more information. Arguments
called \var{path} refer to a pathname given as a string.
Errors are reported as exceptions; the usual exceptions are given Errors are reported as exceptions; the usual exceptions are given
for type errors, while errors reported by the system calls raise for type errors, while errors reported by the system calls raise
@ -340,7 +341,7 @@ Wait for completion of a child process given by proces id, and return
a tuple containing its pid and exit status indication (encoded as by a tuple containing its pid and exit status indication (encoded as by
\UNIX{}). The semantics of the call are affected by the value of \UNIX{}). The semantics of the call are affected by the value of
the integer options, which should be 0 for normal operation. (If the the integer options, which should be 0 for normal operation. (If the
system does not support waitpid(), this always raises system does not support \code{waitpid()}, this always raises
\code{posix.error}. Not on MS-DOS.) \code{posix.error}. Not on MS-DOS.)
\end{funcdesc} \end{funcdesc}

5
Doc/libposixfile.tex
View file

@ -63,11 +63,12 @@ The posixfile object defines the following additional methods:
manual page on your system. manual page on your system.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{flags}{fmt} \begin{funcdesc}{flags}{\optional{flags}}
Set the specified flags for the file that the file object is referring Set the specified flags for the file that the file object is referring
to. The new flags are ORed with the old flags, unless specified to. The new flags are ORed with the old flags, unless specified
otherwise. The format is explained below in a table. Without otherwise. The format is explained below in a table. Without
arguments a string indicating the current flags is returned (this is the \var{flags} argument
a string indicating the current flags is returned (this is
the same as the '?' modifier). For more information about the flags the same as the '?' modifier). For more information about the flags
refer to the fcntl manual page on your system. refer to the fcntl manual page on your system.
\end{funcdesc} \end{funcdesc}

20
Doc/libprofile.tex
View file

@ -267,17 +267,19 @@ function automatically prints a simple profiling report, sorted by the
standard name string (file/line/function-name) that is presented in standard name string (file/line/function-name) that is presented in
each line. The following is a typical output from such a call: each line. The following is a typical output from such a call:
\small{
\begin{verbatim} \begin{verbatim}
main() main()
2706 function calls (2004 primitive calls) in 4.504 CPU seconds 2706 function calls (2004 primitive calls) in 4.504 CPU seconds
Ordered by: standard name Ordered by: standard name
ncalls tottime percall cumtime percall filename:lineno(function) ncalls tottime percall cumtime percall filename:lineno(function)
2 0.006 0.003 0.953 0.477 pobject.py:75(save_objects) 2 0.006 0.003 0.953 0.477 pobject.py:75(save_objects)
43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate) 43/3 0.533 0.012 0.749 0.250 pobject.py:99(evaluate)
... ...
\end{verbatim} \end{verbatim}
}
The first line indicates that this profile was generated by the call:\\ The first line indicates that this profile was generated by the call:\\
\code{profile.run('main()')}, and hence the exec'ed string is \code{profile.run('main()')}, and hence the exec'ed string is
@ -318,6 +320,7 @@ then the latter is the number of primitive calls, and the former is
the actual number of calls. Note that when the function does not the actual number of calls. Note that when the function does not
recurse, these two values are the same, and only the single figure is recurse, these two values are the same, and only the single figure is
printed. printed.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{pstats.Stats}{filename\optional{\, ...}} \begin{funcdesc}{pstats.Stats}{filename\optional{\, ...}}
@ -480,7 +483,8 @@ return the instance that is being processed, so that the commands can
be strung together. For example: be strung together. For example:
\begin{verbatim} \begin{verbatim}
pstats.Stats('foofile').strip_dirs().sort_stats('cum').print_stats().ignore() pstats.Stats('foofile').strip_dirs().sort_stats('cum') \
.print_stats().ignore()
\end{verbatim} \end{verbatim}
would perform all the indicated functions, but it would not return would perform all the indicated functions, but it would not return

2
Doc/libstring.tex
View file

@ -70,7 +70,7 @@ string (after stripping the sign): \samp{0x} or \samp{0X} means 16,
\samp{0} means 8, anything else means 10. If \var{base} is 16, a \samp{0} means 8, anything else means 10. If \var{base} is 16, a
leading \samp{0x} or \samp{0X} is always accepted. (Note: for a more leading \samp{0x} or \samp{0X} is always accepted. (Note: for a more
flexible interpretation of numeric literals, use the built-in function flexible interpretation of numeric literals, use the built-in function
\code{eval()}. \code{eval()}.)
\bifuncindex{eval} \bifuncindex{eval}
\end{funcdesc} \end{funcdesc}

2
Doc/libsun.tex
View file

@ -97,7 +97,7 @@ possibly modified by the program.
\begin{funcdesc}{write}{samples} \begin{funcdesc}{write}{samples}
Write is passed a python string containing audio samples to be played. Write is passed a python string containing audio samples to be played.
If there is enough buffer space free it will immedeately return, If there is enough buffer space free it will immediately return,
otherwise it will block. otherwise it will block.
\end{funcdesc} \end{funcdesc}

2
Doc/libthread.tex
View file

@ -58,7 +58,7 @@ another thread is created.
Lock objects have the following methods: Lock objects have the following methods:
\renewcommand{\indexsubitem}{(lock method)} \renewcommand{\indexsubitem}{(lock method)}
\begin{funcdesc}{acquire}{waitflag} \begin{funcdesc}{acquire}{\optional{waitflag}}
Without the optional argument, this method acquires the lock Without the optional argument, this method acquires the lock
unconditionally, if necessary waiting until it is released by another unconditionally, if necessary waiting until it is released by another
thread (only one thread at a time can acquire a lock --- that's their thread (only one thread at a time can acquire a lock --- that's their

2
Doc/libtypes.tex
View file

@ -305,7 +305,7 @@ operations. The \samp{+} and \samp{*} operations have the same
priority as the corresponding numeric operations.\footnote{They must priority as the corresponding numeric operations.\footnote{They must
have since the parser can't tell the type of the operands.} have since the parser can't tell the type of the operands.}
This table lists the sequece operations sorted in ascending priority This table lists the sequence operations sorted in ascending priority
(operations in the same box have the same priority). In the table, (operations in the same box have the same priority). In the table,
\var{s} and \var{t} are sequences of the same type; \var{n}, \var{i} \var{s} and \var{t} are sequences of the same type; \var{n}, \var{i}
and \var{j} are integers: and \var{j} are integers:

24
Doc/liburlparse.tex
View file

@ -33,9 +33,16 @@ except for a leading slash in the \var{path} component, which is
retained if present. retained if present.
Example: Example:
\code{urlparse('http://www.cwi.nl:80/\%7eguido/Python.html')}
\begin{verbatim}
urlparse('http://www.cwi.nl:80/%7Eguido/Python.html')
\end{verbatim}
yields the tuple yields the tuple
\code{('http', 'www.cwi.nl:80', '/\%7eguido/Python.html', '', '', '')}.
\begin{verbatim}
('http', 'www.cwi.nl:80', '/%7Eguido/Python.html', '', '', '')
\end{verbatim}
If the \var{default_scheme} argument is specified, it gives the If the \var{default_scheme} argument is specified, it gives the
default addressing scheme, to be used only if the URL string does not default addressing scheme, to be used only if the URL string does not
@ -61,9 +68,16 @@ the network location and (part of) the path, to provide missing
components in the relative URL. components in the relative URL.
Example: Example:
\code{urljoin('http://www.cwi.nl/\%7eguido/Python.html',}
\code{'FAQ.html')} yields the string \begin{verbatim}
\code{'http://www.cwi.nl/\%7eguido/FAQ.html'}. urljoin('http://www.cwi.nl/%7Eguido/Python.html', 'FAQ.html')
\end{verbatim}
yields the string
\begin{verbatim}
'http://www.cwi.nl/%7Eguido/FAQ.html'
\end{verbatim}
The \var{allow_fragments} argument has the same meaning as for The \var{allow_fragments} argument has the same meaning as for
\code{urlparse}. \code{urlparse}.

2
Doc/mac/libctb.tex
View file

@ -4,7 +4,7 @@
This module provides a partial interface to the Macintosh This module provides a partial interface to the Macintosh
Communications Toolbox. Currently, only Connection Manager tools are Communications Toolbox. Currently, only Connection Manager tools are
supported. supported. It may not be available in all Mac Python versions.
\begin{datadesc}{error} \begin{datadesc}{error}
The exception raised on errors. The exception raised on errors.

39
Doc/mac/libmacdnr.tex
View file

@ -3,57 +3,58 @@
\bimodindex{macdnr} \bimodindex{macdnr}
This module provides an interface to the Macintosh Domain Name This module provides an interface to the Macintosh Domain Name
Resolver. It is usually used in conjunction with the \var{mactcp} module, to Resolver. It is usually used in conjunction with the \var{mactcp}
map hostnames to IP-addresses. module, to map hostnames to IP-addresses. It may not be available in
all Mac Python versions.
The \code{macdnr} module defines the following functions: The \code{macdnr} module defines the following functions:
\renewcommand{\indexsubitem}{(in module macdnr)} \renewcommand{\indexsubitem}{(in module macdnr)}
\begin{funcdesc}{Open}{\optional{filename}} \begin{funcdesc}{Open}{\optional{filename}}
Open the domain name resolver extension. If \var{filename} is given it Open the domain name resolver extension. If \var{filename} is given it
should be the pathname of the extension, otherwise a default is should be the pathname of the extension, otherwise a default is
used. Normally, this call is not needed since the other calls will used. Normally, this call is not needed since the other calls will
open the extension automatically. open the extension automatically.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{Close}{} \begin{funcdesc}{Close}{}
Close the resolver extension. Again, not needed for normal use. Close the resolver extension. Again, not needed for normal use.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{StrToAddr}{hostname} \begin{funcdesc}{StrToAddr}{hostname}
Look up the IP address for \var{hostname}. This call returns a dnr Look up the IP address for \var{hostname}. This call returns a dnr
result object of the ``address'' variation. result object of the ``address'' variation.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{AddrToName}{addr} \begin{funcdesc}{AddrToName}{addr}
Do a reverse lookup on the 32-bit integer IP-address Do a reverse lookup on the 32-bit integer IP-address
\var{addr}. Returns a dnr result object of the ``address'' variation. \var{addr}. Returns a dnr result object of the ``address'' variation.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{AddrToStr}{addr} \begin{funcdesc}{AddrToStr}{addr}
Convert the 32-bit integer IP-address \var{addr} to a dotted-decimal Convert the 32-bit integer IP-address \var{addr} to a dotted-decimal
string. Returns the string. string. Returns the string.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{HInfo}{hostname} \begin{funcdesc}{HInfo}{hostname}
Query the nameservers for a \code{HInfo} record for host Query the nameservers for a \code{HInfo} record for host
\var{hostname}. These records contain hardware and software \var{hostname}. These records contain hardware and software
information about the machine in question (if they are available in information about the machine in question (if they are available in
the first place). Returns a dnr result object of the ``hinfo'' the first place). Returns a dnr result object of the ``hinfo''
variety. variety.
\end{funcdesc} \end{funcdesc}
\begin{funcdesc}{MXInfo}{domain} \begin{funcdesc}{MXInfo}{domain}
Query the nameservers for a mail exchanger for \var{domain}. This is Query the nameservers for a mail exchanger for \var{domain}. This is
the hostname of a host willing to accept SMTP mail for the given the hostname of a host willing to accept SMTP mail for the given
domain. Returns a dnr result object of the ``mx'' variety. domain. Returns a dnr result object of the ``mx'' variety.
\end{funcdesc} \end{funcdesc}
\subsection{dnr result object} \subsection{dnr result object}
Since the DNR calls all execute asynchronously you do not get the Since the DNR calls all execute asynchronously you do not get the
results back immedeately. In stead, you get a dnr result object. You results back immediately. Instead, you get a dnr result object. You
can check this object to see whether the query is complete, and access can check this object to see whether the query is complete, and access
its attributes to obtain the information when it is. its attributes to obtain the information when it is.
@ -89,23 +90,23 @@ The canonical name of the host that was queried.
\dataline{ip1} \dataline{ip1}
\dataline{ip2} \dataline{ip2}
\dataline{ip3} \dataline{ip3}
At most four integer IP addresses for this host. Unused entries are At most four integer IP addresses for this host. Unused entries are
zero. Valid only for address queries. zero. Valid only for address queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{cpuType} \begin{datadesc}{cpuType}
\dataline{osType} \dataline{osType}
Textual strings giving the machine type an OS name. Valid for hinfo Textual strings giving the machine type an OS name. Valid for hinfo
queries. queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{exchange} \begin{datadesc}{exchange}
The name of a mail-exchanger host. Valid for mx queries. The name of a mail-exchanger host. Valid for mx queries.
\end{datadesc} \end{datadesc}
\begin{datadesc}{preference} \begin{datadesc}{preference}
The preference of this mx record. Not too useful, since the Macintosh The preference of this mx record. Not too useful, since the Macintosh
will only return a single mx record. Mx queries only. will only return a single mx record. Mx queries only.
\end{datadesc} \end{datadesc}
The simplest way to use the module to convert names to dotted-decimal The simplest way to use the module to convert names to dotted-decimal

3
Doc/mac/libmacspeech.tex
View file

@ -7,7 +7,8 @@ This module provides an interface to the Macintosh Speech Manager,
allowing you to let the Macintosh utter phrases. You need a version of allowing you to let the Macintosh utter phrases. You need a version of
the speech manager extension (version 1 and 2 have been tested) in the speech manager extension (version 1 and 2 have been tested) in
your \code{Extensions} folder for this to work. The module does not your \code{Extensions} folder for this to work. The module does not
provide full access to all features of the Speech Manager yet. provide full access to all features of the Speech Manager yet. It may
not be available in all Mac Python versions.
\begin{funcdesc}{Available}{} \begin{funcdesc}{Available}{}
Test availability of the Speech Manager extension (and, on the Test availability of the Speech Manager extension (and, on the

3
Doc/mac/libmactcp.tex
View file

@ -8,7 +8,8 @@ MacTCP\@. There is an accompanying module \code{macdnr} which provides an
interface to the name-server (allowing you to translate hostnames to interface to the name-server (allowing you to translate hostnames to
ip-addresses), a module \code{MACTCP} which has symbolic names for ip-addresses), a module \code{MACTCP} which has symbolic names for
constants constants used by MacTCP and a wrapper module \code{socket} constants constants used by MacTCP and a wrapper module \code{socket}
which mimics the \UNIX{} socket interface (as far as possible). which mimics the \UNIX{} socket interface (as far as possible). It may
not be available in all Mac Python versions.
A complete description of the MacTCP interface can be found in the A complete description of the MacTCP interface can be found in the
Apple MacTCP API documentation. Apple MacTCP API documentation.

2
Doc/texinputs/boilerplate.tex
View file

@ -5,4 +5,4 @@
E-mail: {\tt guido@cwi.nl} E-mail: {\tt guido@cwi.nl}
} }
\date{28 March 1995 \\ Release 1.2-proof-3} % XXX update before release! \date{10 April 1995 \\ Release 1.2} % XXX update before release!

2
Doc/texipre.dat
View file

@ -77,7 +77,7 @@ the language, see the @cite{Python Tutorial}. The @cite{Python
Reference Manual} gives a more formal definition of the language. Reference Manual} gives a more formal definition of the language.
(These manuals are not yet available in INFO or Texinfo format.) (These manuals are not yet available in INFO or Texinfo format.)
This version corresponds to Python version 1.2. This version corresponds to Python version 1.2 (4 April 1995).
@end ifinfo @end ifinfo

4
Doc/tut.tex
View file

@ -2157,7 +2157,7 @@ names, and the outermost scope (searched last) is the name space
containing built-in names. containing built-in names.
Usually, the local scope references the local names of the (textually) Usually, the local scope references the local names of the (textually)
current function. Outside of functions, the the local scope references current function. Outside of functions, the local scope references
the same name space as the global scope: the module's name space. the same name space as the global scope: the module's name space.
Class definitions place yet another name space in the local scope. Class definitions place yet another name space in the local scope.
@ -2165,7 +2165,7 @@ It is important to realize that scopes are determined textually: the
global scope of a function defined in a module is that module's name global scope of a function defined in a module is that module's name
space, no matter from where or by what alias the function is called. space, no matter from where or by what alias the function is called.
On the other hand, the actual search for names is done dynamically, at On the other hand, the actual search for names is done dynamically, at
run time --- however, the the language definition is evolving towards run time --- however, the language definition is evolving towards
static name resolution, at ``compile'' time, so don't rely on dynamic static name resolution, at ``compile'' time, so don't rely on dynamic
name resolution! (In fact, local variables are already determined name resolution! (In fact, local variables are already determined
statically.) statically.)

4
Doc/tut/tut.tex
View file

@ -2157,7 +2157,7 @@ names, and the outermost scope (searched last) is the name space
containing built-in names. containing built-in names.
Usually, the local scope references the local names of the (textually) Usually, the local scope references the local names of the (textually)
current function. Outside of functions, the the local scope references current function. Outside of functions, the local scope references
the same name space as the global scope: the module's name space. the same name space as the global scope: the module's name space.
Class definitions place yet another name space in the local scope. Class definitions place yet another name space in the local scope.
@ -2165,7 +2165,7 @@ It is important to realize that scopes are determined textually: the
global scope of a function defined in a module is that module's name global scope of a function defined in a module is that module's name
space, no matter from where or by what alias the function is called. space, no matter from where or by what alias the function is called.
On the other hand, the actual search for names is done dynamically, at On the other hand, the actual search for names is done dynamically, at
run time --- however, the the language definition is evolving towards run time --- however, the language definition is evolving towards
static name resolution, at ``compile'' time, so don't rely on dynamic static name resolution, at ``compile'' time, so don't rely on dynamic
name resolution! (In fact, local variables are already determined name resolution! (In fact, local variables are already determined
statically.) statically.)