Jelle Zijlstra 318cada66c os: merge the top and bottom of os/__init__.pyi (#1458) ...

* os: merge the top and bottom of os/__init__.pyi

Part of #1427. In preparation for merging the two stubs, I'm making the files
identical as much as possible. This PR merges the top of the file, down to
but not including the definition of statvfs_result, and the bottom up to
and including os.utime.

This PR mostly adds more "if sys.version_info" block. Until the merger
completes, we'll have some Python 2 blocks in the Python 3 stub and vice versa.
I also add a few missing constants and arguments.

In followup PRs I'll merge the rest of the file. I'll put the trickiest part
(the return values of functions like os.stat) in its own PR.

* back out DirEntry from py2

It relies on stat_result which we don't have yet in py2.

2017-07-04 19:30:55 -07:00

..

__init__.pyi

os: merge the top and bottom of os/__init__.pyi (#1458)

2017-07-04 19:30:55 -07:00

path.pyi

make os.path identical in Python 2 and 3 (#1459)

2017-07-04 19:27:27 -07:00