[Python-checkins] cpython (merge 3.1 -> 3.1): Branch merge (original) (raw)
eric.araujo python-checkins at python.org
Sat Mar 26 02:04:21 CET 2011
- Previous message: [Python-checkins] cpython: Remove traces of division_warning left over from Python 2 (#10998)
- Next message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
http://hg.python.org/cpython/rev/ec25055d30f1 changeset: 68951:ec25055d30f1 branch: 3.1 parent: 68942:c4d355363114 parent: 68948:6077424007f5 user: Éric Araujo <merwok at netwok.org> date: Sat Mar 26 01:55:56 2011 +0100 summary: Branch merge
files: Doc/library/http.cookiejar.rst | 2 +- Doc/library/readline.rst | 2 +- Doc/library/sys.rst | 40 ++++++++------------- Doc/tutorial/interactive.rst | 5 +-- 4 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/Doc/library/http.cookiejar.rst b/Doc/library/http.cookiejar.rst --- a/Doc/library/http.cookiejar.rst +++ b/Doc/library/http.cookiejar.rst @@ -719,7 +719,7 @@
import os, http.cookiejar, urllib.request
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)) r = opener.open("http://example.com/")
diff --git a/Doc/library/readline.rst b/Doc/library/readline.rst --- a/Doc/library/readline.rst +++ b/Doc/library/readline.rst @@ -197,7 +197,7 @@
import os
import readline- histfile = os.path.join(os.environ["HOME"], ".pyhist")
- histfile = os.path.join(os.path.expanduser("~"), ".pyhist") try: readline.read_history_file(histfile) except IOError: diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst --- a/Doc/library/sys.rst +++ b/Doc/library/sys.rst @@ -206,31 +206,21 @@ 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 - ============================= =============================
.. data:: float_info diff --git a/Doc/tutorial/interactive.rst b/Doc/tutorial/interactive.rst --- a/Doc/tutorial/interactive.rst +++ b/Doc/tutorial/interactive.rst @@ -123,10 +123,7 @@ # 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
to it: "export PYTHONSTARTUP=/home/user/.pystartup" in bash.
Note that PYTHONSTARTUP does not expand "~", so you have to put in the
full path to your home directory.
to it: "export PYTHONSTARTUP=~/.pystartup" in bash.
import atexit import os
-- Repository URL: http://hg.python.org/cpython
- Previous message: [Python-checkins] cpython: Remove traces of division_warning left over from Python 2 (#10998)
- Next message: [Python-checkins] cpython (merge 3.1 -> 3.2): Merge 3.1
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]