diff options
| author | Trent Nelson <trent@trent.me> | 2012-10-17 18:08:16 -0400 |
|---|---|---|
| committer | Trent Nelson <trent@trent.me> | 2012-10-17 18:08:16 -0400 |
| commit | dd35500073739c8b697dac7a84f323d5854cee39 (patch) | |
| tree | 2fa2928ed415116c69ebfeacf461829c666ae320 /Doc | |
| parent | ecbe2a91850516e41715885e6688e31935ed8f2c (diff) | |
| parent | e60983e4a5f1294ef887f0a7df0d011f5569ed4e (diff) | |
| download | cpython-git-dd35500073739c8b697dac7a84f323d5854cee39.tar.gz | |
Merge heads.
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/tutorial/inputoutput.rst | 2 | ||||
| -rw-r--r-- | Doc/using/cmdline.rst | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Doc/tutorial/inputoutput.rst b/Doc/tutorial/inputoutput.rst index 45de518de8..73143bee80 100644 --- a/Doc/tutorial/inputoutput.rst +++ b/Doc/tutorial/inputoutput.rst @@ -184,7 +184,7 @@ square brackets ``'[]'`` to access the keys :: >>> table = {'Sjoerd': 4127, 'Jack': 4098, 'Dcab': 8637678} >>> print('Jack: {0[Jack]:d}; Sjoerd: {0[Sjoerd]:d}; ' - 'Dcab: {0[Dcab]:d}'.format(table)) + ... 'Dcab: {0[Dcab]:d}'.format(table)) Jack: 4098; Sjoerd: 4127; Dcab: 8637678 This could also be done by passing the table as keyword arguments with the '**' diff --git a/Doc/using/cmdline.rst b/Doc/using/cmdline.rst index 8864b794cb..dbe6c4727b 100644 --- a/Doc/using/cmdline.rst +++ b/Doc/using/cmdline.rst @@ -380,7 +380,10 @@ Options you shouldn't use Environment variables --------------------- -These environment variables influence Python's behavior. +These environment variables influence Python's behavior, they are processed +before the command-line switches other than -E. It is customary that +command-line switches override environmental variables where there is a +conflict. .. envvar:: PYTHONHOME @@ -577,4 +580,3 @@ if Python was configured with the ``--with-pydebug`` build option. If set, Python will print memory allocation statistics every time a new object arena is created, and on shutdown. - |