[Python-checkins] cpython (merge 3.4 -> default): merge 3.4

[benjamin.peterson]

https://hg.python.org/cpython/rev/7e86b296deeb
changeset:   94986:7e86b296deeb
parent:      94983:d33a43154794
parent:      94985:c9650423c336
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Mar 13 16:21:29 2015 -0500
summary:
  merge 3.4

files:
  Doc/library/modulefinder.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/modulefinder.rst b/Doc/library/modulefinder.rst
--- a/Doc/library/modulefinder.rst
+++ b/Doc/library/modulefinder.rst
@@ -104,7 +104,7 @@
     re:  __module__,finditer,_expand
     itertools:
     __main__:  re,itertools,baconhameggs
-    sre_parse:  __getslice__,_PATTERNENDERS,SRE_FLAG_UNICODE
+    sre_parse:  _PATTERNENDERS,SRE_FLAG_UNICODE
     array:
     types:  __module__,IntType,TypeType
     ---------------------------------------------------

-- 
Repository URL: https://hg.python.org/cpython