Daniel Shaulov e2c9ec5cb0 Merge branch 'master' into threading ...

Conflicts:
	stdlib/3/threading.pyi

2016-01-23 10:34:30 +00:00

..

2.7

Merge branch 'master' into threading

2016-01-23 10:34:30 +00:00

2and3

Move contents of builtins/* to stdlib/*. This simplifies finding stubs.

2016-01-12 12:53:18 -08:00

3

Merge branch 'master' into threading

2016-01-23 10:34:30 +00:00

3.3

Consistently use '= ...' for optional parameters.

2015-11-09 13:55:02 -08:00

3.4

Fix up uses of Future as an argument in asyncio

2016-01-19 16:53:52 -08:00