cpython: ec25055d30f1 (original) (raw)
Mercurial > cpython
changeset 68951:ec25055d30f1 3.1
Branch merge
| Éric Araujo merwok@netwok.org | |
|---|---|
| date | Sat, 26 Mar 2011 01:55:56 +0100 |
| parents | c4d355363114(current diff)6077424007f5(diff) |
| children | 12e044c29e6a 0cb276628528 97c31d27456e |
| files | |
| diffstat | 4 files changed, 18 insertions(+), 31 deletions(-)[+] [-] Doc/library/http.cookiejar.rst 2 Doc/library/readline.rst 2 Doc/library/sys.rst 40 Doc/tutorial/interactive.rst 5 |
line wrap: on
line diff
--- a/Doc/library/http.cookiejar.rst +++ b/Doc/library/http.cookiejar.rst @@ -719,7 +719,7 @@ cookies (assumes Unix/Netscape conventio import os, http.cookiejar, urllib.request cj = http.cookiejar.MozillaCookieJar()
- cj.load(os.path.join(os.path.expanduser("~"), ".netscape", "cookies.txt")) opener = urllib.request.build_opener(urllib.request.HTTPCookieProcessor(cj)) r = opener.open("http://example.com/")[](#l1.10)
--- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -197,7 +197,7 @@ normally be executed automatically durin import os import readline
- histfile = os.path.join(os.path.expanduser("~"), ".pyhist") try: readline.read_history_file(histfile) except IOError:
--- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -206,31 +206,21 @@ always available. The struct sequence flags exposes the status of command line flags. The attributes are read only.
- +------------------------------+------------------------------------------+
- | attribute | flag |
- +==============================+==========================================+
- | :const:
debug| -d | - +------------------------------+------------------------------------------+
- | :const:
division_warning| -Q | - +------------------------------+------------------------------------------+
- | :const:
inspect| -i | - +------------------------------+------------------------------------------+
- | :const:
interactive| -i | - +------------------------------+------------------------------------------+
- | :const:
optimize| -O or -OO | - +------------------------------+------------------------------------------+
- | :const:
dont_write_bytecode| -B | - +------------------------------+------------------------------------------+
- | :const:
no_user_site| -s | - +------------------------------+------------------------------------------+
- | :const:
no_site| -S | - +------------------------------+------------------------------------------+
- | :const:
ignore_environment| -E | - +------------------------------+------------------------------------------+
- | :const:
verbose| -v | - +------------------------------+------------------------------------------+
- | :const:
bytes_warning| -b | - +------------------------------+------------------------------------------+
- ============================= =============================
- attribute flag
- ============================= =============================
- :const:
debug:option:-d - :const:
division_warning:option:-Q - :const:
inspect:option:-i - :const:
interactive:option:-i - :const:
optimize:option:-Oor :option:-OO - :const:
dont_write_bytecode:option:-B - :const:
no_user_site:option:-s - :const:
no_site:option:-S - :const:
ignore_environment:option:-E - :const:
verbose:option:-v - :const:
bytes_warning:option:-b - ============================= =============================
--- a/Doc/tutorial/interactive.rst +++ b/Doc/tutorial/interactive.rst @@ -123,10 +123,7 @@ interpreter. :: # 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