Merge 3.2

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

View file

@ -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
# 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