diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 18:29:10 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 18:29:10 (GMT) |
| commit | ae26cce9a3a4c659409583b3115f1c29050b1685 (patch) | |
| tree | 015e91ce2ee89ebaab5d27600c8fd235396b78b8 /Doc/tutorial | |
| parent | 67733311048573c734bbf98cebd474d308528514 (diff) | |
| download | cpython-ae26cce9a3a4c659409583b3115f1c29050b1685.zip cpython-ae26cce9a3a4c659409583b3115f1c29050b1685.tar.gz cpython-ae26cce9a3a4c659409583b3115f1c29050b1685.tar.bz2 | |
Recorded merge of revisions 86795,86798-86799,86801 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
........
r86795 | georg.brandl | 2010-11-26 12:55:48 +0100 (Fr, 26 Nov 2010) | 1 line
Use PyLong_FromLong where appropriate.
........
r86798 | georg.brandl | 2010-11-26 13:05:48 +0100 (Fr, 26 Nov 2010) | 1 line
#10420: fix docs of bdb.effective().
........
r86799 | georg.brandl | 2010-11-26 13:08:19 +0100 (Fr, 26 Nov 2010) | 1 line
Remove parenthetical remark that is confusing now that the module is not named "__builtin__" anymore.
........
r86801 | georg.brandl | 2010-11-26 13:12:14 +0100 (Fr, 26 Nov 2010) | 1 line
Better example for os.system(): do not change the system time.
........
Diffstat (limited to 'Doc/tutorial')
| -rw-r--r-- | Doc/tutorial/stdlib.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Doc/tutorial/stdlib.rst b/Doc/tutorial/stdlib.rst index 0f607c4..4771d44 100644 --- a/Doc/tutorial/stdlib.rst +++ b/Doc/tutorial/stdlib.rst @@ -14,11 +14,11 @@ The :mod:`os` module provides dozens of functions for interacting with the operating system:: >>> import os - >>> os.system('time 0:02') - 0 >>> os.getcwd() # Return the current working directory 'C:\\Python31' - >>> os.chdir('/server/accesslogs') + >>> os.chdir('/server/accesslogs') # Change current working directory + >>> os.system('mkdir today') # Run the command mkdir in the system shell + 0 Be sure to use the ``import os`` style instead of ``from os import *``. This will keep :func:`os.open` from shadowing the built-in :func:`open` function which |