Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge os stubs into 2and3 #1427

Closed
JelleZijlstra opened this issue Jun 22, 2017 · 1 comment
Closed

Merge os stubs into 2and3 #1427

JelleZijlstra opened this issue Jun 22, 2017 · 1 comment
Labels
stubs: improvement Improve/refactor existing annotations, other stubs issues

Comments

@JelleZijlstra
Copy link
Member

I started doing this in #1324 but put too much in a single PR. I'll instead submit a series of simpler PRs.

The return types of os.stat and similar will require especial care (see Guido's comments in #1324).
@JelleZijlstra JelleZijlstra mentioned this issue Jun 22, 2017
Merged
JelleZijlstra added a commit to JelleZijlstra/typeshed that referenced this issue Jul 2, 2017
@JelleZijlstra
os: merge the top and bottom of os/__init__.pyi
eefa399 
Part of python#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.
@JelleZijlstra JelleZijlstra mentioned this issue Jul 2, 2017
Merged
JelleZijlstra added a commit to JelleZijlstra/typeshed that referenced this issue Jul 2, 2017
@JelleZijlstra
make os.path identical in Python 2 and 3
c1c3c20 
Part of python#1427. I don't think we can actually merge these until we merge
os/__init__.pyi too, which will take a few more PRs.
@JelleZijlstra JelleZijlstra mentioned this issue Jul 2, 2017
Merged
matthiaskramm pushed a commit that referenced this issue Jul 5, 2017
@JelleZijlstra @matthiaskramm
make os.path identical in Python 2 and 3 (#1459)
a419b69 
Part of #1427. I don't think we can actually merge these until we merge
os/__init__.pyi too, which will take a few more PRs.
matthiaskramm pushed a commit that referenced this issue Jul 5, 2017
@JelleZijlstra @matthiaskramm
os: merge the top and bottom of os/__init__.pyi (#1458)
318cada 
* 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.
@srittau srittau mentioned this issue Sep 11, 2018
Closed
@srittau srittau added the stubs: improvement Improve/refactor existing annotations, other stubs issues label Oct 28, 2018
@hauntsaninja
Copy link
Collaborator

Closing, as discussed in #4

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
stubs: improvement Improve/refactor existing annotations, other stubs issues
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@srittau @JelleZijlstra @hauntsaninja