Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 65378-65379,65430 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r65378 | georg.brandl | 2008-08-01 22:04:43 +0200 (Fri, 01 Aug 2008) | 4 lines

  Add the grammar to the reference manual, since the new docs don't
  have the feature of putting all the small EBNF snippets together
  into one big file.
........
  r65379 | georg.brandl | 2008-08-01 22:13:29 +0200 (Fri, 01 Aug 2008) | 2 lines

  This should really be a comment.
........
  r65430 | georg.brandl | 2008-08-03 11:21:18 +0200 (Sun, 03 Aug 2008) | 2 lines

  #3495: use current version.
........
This commit is contained in:
Georg Brandl 2008-08-03 09:47:27 +00:00
parent cca483a740
commit 5b318c0e07
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Doc/library/site.rst
View File

@ -61,8 +61,8 @@ and :file:`bar.pth` contains::
Then the following directories are added to ``sys.path``, in this order::
/usr/local/lib/python2.3/site-packages/bar
/usr/local/lib/python2.3/site-packages/foo
/usr/local/lib/python2.6/site-packages/bar
/usr/local/lib/python2.6/site-packages/foo
Note that :file:`bletch` is omitted because it doesn't exist; the :file:`bar`
directory precedes the :file:`foo` directory because :file:`bar.pth` comes

7
Doc/reference/grammar.rst Normal file
View File

@ -0,0 +1,7 @@
Full Grammar specification
==========================
This is the full Python grammar, as it is read by the parser generator and used
to parse Python source files:
.. literalinclude:: ../../Grammar/Grammar

2
Doc/reference/index.rst
View File

@ -27,4 +27,4 @@ interfaces available to C/C++ programmers in detail.
simple_stmts.rst
compound_stmts.rst
toplevel_components.rst
grammar.rst

11
Doc/reference/simple_stmts.rst
View File

@ -727,10 +727,13 @@ raise a :exc:`SyntaxError`.
the module search path is carried out differently. The sequence of identifiers
up to the last dot is used to find a "package"; the final identifier is then
searched inside the package. A package is generally a subdirectory of a
directory on ``sys.path`` that has a file :file:`__init__.py`. [XXX Can't be
bothered to spell this out right now; see the URL
http://www.python.org/doc/essays/packages.html for more details, also about how
the module search works from inside a package.]
directory on ``sys.path`` that has a file :file:`__init__.py`.
..
[XXX Can't be
bothered to spell this out right now; see the URL
http://www.python.org/doc/essays/packages.html for more details, also about how
the module search works from inside a package.]
.. index:: builtin: __import__