mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge 3.2

Browse source
This commit is contained in:
Éric Araujo 2011-03-26 02:00:51 +01:00
commit 5c1da90f8c
4 changed files with 19 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Doc/library/http.cookiejar.rst
View file

@ -722,7 +722,7 @@ cookies (assumes Unix/Netscape convention for location of the cookies file)::
import os, http.cookiejar, urllib.request import os, http.cookiejar, urllib.request
cj = http.cookiejar.MozillaCookieJar() cj = http.cookiejar.MozillaCookieJar()
cj.load(os.path.join(os.environ["HOME"], ".netscape/cookies.txt")) cj.load(os.path.join(os.path.expanduser("~"), ".netscape", "cookies.txt"))
opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj)) opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj))
r = opener.open("http://example.com/") r = opener.open("http://example.com/")

2
Doc/library/readline.rst
View file

@ -196,7 +196,7 @@ normally be executed automatically during interactive sessions from the user's
import os import os
import readline import readline
histfile = os.path.join(os.environ["HOME"], ".pyhist") histfile = os.path.join(os.path.expanduser("~"), ".pyhist")
try: try:
readline.read_history_file(histfile) readline.read_history_file(histfile)
except IOError: except IOError:

43
Doc/library/sys.rst
View file

@ -227,33 +227,22 @@ always available.
The struct sequence *flags* exposes the status of command line flags. The The struct sequence *flags* exposes the status of command line flags. The
attributes are read only. attributes are read only.
+------------------------------+------------------------------------------+ ============================= =============================
| attribute | flag | attribute flag
+==============================+==========================================+ ============================= =============================
| :const:`debug` | -d | :const:`debug` :option:`-d`
+------------------------------+------------------------------------------+ :const:`division_warning` :option:`-Q`
| :const:`division_warning` | -Q | :const:`inspect` :option:`-i`
+------------------------------+------------------------------------------+ :const:`interactive` :option:`-i`
| :const:`inspect` | -i | :const:`optimize` :option:`-O` or :option:`-OO`
+------------------------------+------------------------------------------+ :const:`dont_write_bytecode` :option:`-B`
| :const:`interactive` | -i | :const:`no_user_site` :option:`-s`
+------------------------------+------------------------------------------+ :const:`no_site` :option:`-S`
| :const:`optimize` | -O or -OO | :const:`ignore_environment` :option:`-E`
+------------------------------+------------------------------------------+ :const:`verbose` :option:`-v`
| :const:`dont_write_bytecode` | -B | :const:`bytes_warning` :option:`-b`
+------------------------------+------------------------------------------+ :const:`quiet` :option:`-q`
| :const:`no_user_site` | -s | ============================= =============================
+------------------------------+------------------------------------------+
| :const:`no_site` | -S |
+------------------------------+------------------------------------------+
| :const:`ignore_environment` | -E |
+------------------------------+------------------------------------------+
| :const:`verbose` | -v |
+------------------------------+------------------------------------------+
| :const:`bytes_warning` | -b |
+------------------------------+------------------------------------------+
| :const:`quiet` | -q |
+------------------------------+------------------------------------------+
.. versionchanged:: 3.2 .. versionchanged:: 3.2
Added ``quiet`` attribute for the new :option:`-q` flag. Added ``quiet`` attribute for the new :option:`-q` flag.

5
Doc/tutorial/interactive.rst
View file

@ -123,10 +123,7 @@ interpreter. ::
# bound to the Esc key by default (you can change it - see readline docs). # bound to the Esc key by default (you can change it - see readline docs).
# #
# Store the file in ~/.pystartup, and set an environment variable to point # Store the file in ~/.pystartup, and set an environment variable to point
# to it: "export PYTHONSTARTUP=/home/user/.pystartup" in bash. # to it: "export PYTHONSTARTUP=~/.pystartup" in bash.
#
# Note that PYTHONSTARTUP does *not* expand "~", so you have to put in the
# full path to your home directory.
import atexit import atexit
import os import os