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.

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

Use 'as name' patter to re-export names from stubs (PEP 484) #1484

Merged
merged 4 commits into from
Jul 15, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/3.4/asyncio/locks.pyi
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from typing import Any, Callable, Generator, Iterable, Iterator, List, Type, TypeVar, Union, Optional
from typing import Any, Callable, Generator, Iterable, Iterator, List, Type, TypeVar, Union, Optional, Awaitable

from .coroutines import coroutine
from .events import AbstractEventLoop
from .futures import Future, Awaitable
from .futures import Future
from types import TracebackType

_T = TypeVar('_T')
Expand Down
6 changes: 3 additions & 3 deletions stdlib/3/json/__init__.pyi
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import sys
from typing import Any, IO, Optional, Tuple, Callable, Dict, List, Union

from .decoder import JSONDecoder
from .encoder import JSONEncoder
from .decoder import JSONDecoder as JSONDecoder
from .encoder import JSONEncoder as JSONEncoder
if sys.version_info >= (3, 5):
from .decoder import JSONDecodeError
from .decoder import JSONDecodeError as JSONDecodeError

def dumps(obj: Any,
skipkeys: bool = ...,
Expand Down
3 changes: 2 additions & 1 deletion third_party/2and3/click/globals.pyi
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from click.core import Optional, Context
from click.core import Context
from typing import Optional


def get_current_context(silent: bool = False) -> Context:
Expand Down
2 changes: 1 addition & 1 deletion third_party/2and3/jinja2/utils.pyi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from typing import Any, Optional

from markupsafe import Markup, escape, soft_unicode
from markupsafe import Markup as Markup, escape as escape, soft_unicode as soft_unicode
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a little strange (Jinja2 exports functions from markupsafe directly), but confirmed that it's correct.


missing = ... # type: Any
internal_code = ... # type: Any
Expand Down