merge 3.4

This commit is contained in:
Benjamin Peterson 2015-03-13 16:21:29 -05:00
commit 76c95a01dc

View file

@ -104,7 +104,7 @@ Sample output (may vary depending on the architecture)::
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
---------------------------------------------------