diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-09-13 07:46:37 (GMT) |
| commit | 9b90cd1f7b7fa658a48389ca599cd6ffde922e34 (patch) | |
| tree | 860050591ce74169f13d8fb1ebaf3cb735de6b7e /Doc/reference | |
| parent | f994f047455f9a558f9da4a9a9df9a679fcdd628 (diff) | |
| download | cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.zip cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.gz cpython-9b90cd1f7b7fa658a48389ca599cd6ffde922e34.tar.bz2 | |
Merged revisions 84470-84471,84566-84567,84759 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84470 | florent.xicluna | 2010-09-03 22:00:37 +0200 (ven., 03 sept. 2010) | 1 line
Strengthen BytesWarning tests.
........
r84471 | florent.xicluna | 2010-09-03 22:23:40 +0200 (ven., 03 sept. 2010) | 1 line
Typo
........
r84566 | florent.xicluna | 2010-09-06 22:27:15 +0200 (lun., 06 sept. 2010) | 1 line
typo
........
r84567 | florent.xicluna | 2010-09-06 22:27:55 +0200 (lun., 06 sept. 2010) | 1 line
typo
........
r84759 | florent.xicluna | 2010-09-13 04:28:18 +0200 (lun., 13 sept. 2010) | 1 line
Reenable test_ucs4 and remove some duplicated lines.
........
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index b9cdd91..c0d8182 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -836,7 +836,7 @@ leading dot means the current package where the module making the import exists. Two dots means up one package level. Three dots is up two levels, etc. So if you execute ``from . import mod`` from a module in the ``pkg`` package then you will end up importing ``pkg.mod``. If you execute ``from ..subpkg2 -imprt mod`` from within ``pkg.subpkg1`` you will import ``pkg.subpkg2.mod``. +import mod`` from within ``pkg.subpkg1`` you will import ``pkg.subpkg2.mod``. The specification for relative imports is contained within :pep:`328`. :func:`importlib.import_module` is provided to support applications that |