From 52dcfeed12fb4eaa05fe8837c943bb08faf5e860 Mon Sep 17 00:00:00 2001 From: Jelle Zijlstra Date: Fri, 17 Mar 2017 10:39:44 -0700 Subject: [PATCH] merge 2 and 3 stubs for unicodedata (#1013) * merge 2 and 3 stubs for unicodedata * fix a few return types to str in py2 --- stdlib/2/unicodedata.pyi | 40 ------------------------------------ stdlib/2and3/unicodedata.pyi | 38 ++++++++++++++++++++++++++++++++++ stdlib/3/unicodedata.pyi | 36 -------------------------------- 3 files changed, 38 insertions(+), 76 deletions(-) delete mode 100644 stdlib/2/unicodedata.pyi create mode 100644 stdlib/2and3/unicodedata.pyi delete mode 100644 stdlib/3/unicodedata.pyi diff --git a/stdlib/2/unicodedata.pyi b/stdlib/2/unicodedata.pyi deleted file mode 100644 index 1faf16a02..000000000 --- a/stdlib/2/unicodedata.pyi +++ /dev/null @@ -1,40 +0,0 @@ -"""Stubs for the 'unicodedata' module.""" - -from typing import Any, TypeVar, Union - -ucd_3_2_0 = ... # type: UCD -unidata_version = ... # type: str -# PyCapsule -ucnhash_CAPI = ... # type: Any - -_default = TypeVar("_default") - -def bidirectional(unichr: unicode) -> str: ... -def category(unichr: unicode) -> str: ... -def combining(unichr: unicode) -> int: ... -def decimal(chr: unicode, default: _default = ...) -> Union[int, _default]: ... -def decomposition(unichr: unicode) -> str: ... -def digit(chr: unicode, default: _default = ...) -> Union[int, _default]: ... -def east_asian_width(unichr: unicode) -> str: ... -def lookup(name: str) -> unicode: ... -def mirrored(unichr: unicode) -> int: ... -def name(chr: unicode, default: _default = ...) -> Union[str, _default]: ... -def normalize(form: str, unistr: unicode) -> unicode: ... -def numeric(chr, default: _default = ...) -> Union[float, _default]: ... - -class UCD(object): - unidata_version = ... # type: str - # The methods below are constructed from the same array in C - # (unicodedata_functions) and hence identical to the methods above. - def bidirectional(self, unichr: unicode) -> str: ... - def category(self, unichr: unicode) -> str: ... - def combining(self, unichr: unicode) -> int: ... - def decimal(self, chr: unicode, default: _default = ...) -> Union[int, _default]: ... - def decomposition(self, unichr: unicode) -> str: ... - def digit(self, chr: unicode, default: _default = ...) -> Union[int, _default]: ... - def east_asian_width(self, unichr: unicode) -> str: ... - def lookup(self, name: str) -> unicode: ... - def mirrored(self, unichr: unicode) -> int: ... - def name(self, chr: unicode, default: _default = ...) -> Union[str, _default]: ... - def normalize(self, form: str, unistr: unicode) -> unicode: ... - def numeric(self, chr: unicode, default: _default = ...) -> Union[float, _default]: ... diff --git a/stdlib/2and3/unicodedata.pyi b/stdlib/2and3/unicodedata.pyi new file mode 100644 index 000000000..6da12c331 --- /dev/null +++ b/stdlib/2and3/unicodedata.pyi @@ -0,0 +1,38 @@ +# Stubs for unicodedata (Python 2.7 and 3.4) +from typing import Any, Text, TypeVar, Union + +ucd_3_2_0 = ... # type: UCD +ucnhash_CAPI = ... # type: Any +unidata_version = ... # type: str + +_default = TypeVar('_default') + +def bidirectional(__chr: Text) -> Text: ... +def category(__chr: Text) -> Text: ... +def combining(__chr: Text) -> int: ... +def decimal(__chr: Text, __default: _default=...) -> Union[int, _default]: ... +def decomposition(__chr: Text) -> Text: ... +def digit(__chr: Text, __default: _default=...) -> Union[int, _default]: ... +def east_asian_width(__chr: Text) -> Text: ... +def lookup(__name: Union[Text, bytes]) -> Text: ... +def mirrored(__chr: Text) -> int: ... +def name(__chr: Text, __default: _default=...) -> Union[Text, _default]: ... +def normalize(__form: Text, __unistr: Text) -> Text: ... +def numeric(__chr: Text, __default: _default=...) -> Union[float, _default]: ... + +class UCD(object): + # The methods below are constructed from the same array in C + # (unicodedata_functions) and hence identical to the methods above. + unidata_version = ... # type: str + def bidirectional(self, __chr: Text) -> str: ... + def category(self, __chr: Text) -> str: ... + def combining(self, __chr: Text) -> int: ... + def decimal(self, __chr: Text, __default: _default=...) -> Union[int, _default]: ... + def decomposition(self, __chr: Text) -> str: ... + def digit(self, __chr: Text, __default: _default=...) -> Union[int, _default]: ... + def east_asian_width(self, __chr: Text) -> str: ... + def lookup(self, __name: Union[Text, bytes]) -> Text: ... + def mirrored(self, __chr: Text) -> int: ... + def name(self, __chr: Text, __default: _default=...) -> Union[Text, _default]: ... + def normalize(self, __form: Text, __unistr: Text) -> Text: ... + def numeric(self, __chr: Text, __default: _default=...) -> Union[float, _default]: ... diff --git a/stdlib/3/unicodedata.pyi b/stdlib/3/unicodedata.pyi deleted file mode 100644 index b9ff64e41..000000000 --- a/stdlib/3/unicodedata.pyi +++ /dev/null @@ -1,36 +0,0 @@ -# Stubs for unicodedata (Python 3.4) -from typing import Any, TypeVar, Union - -ucd_3_2_0 = ... # type: UCD -ucnhash_CAPI = ... # type: Any -unidata_version = ... # type: str - -_default = TypeVar('_default') - -def bidirectional(__chr: str) -> str: ... -def category(__chr: str) -> str: ... -def combining(__chr: str) -> int: ... -def decimal(__chr: str, __default: _default=...) -> Union[int, _default]: ... -def decomposition(__chr: str) -> str: ... -def digit(__chr: str, __default: _default=...) -> Union[int, _default]: ... -def east_asian_width(__chr: str) -> str: ... -def lookup(__name: Union[str, bytes]) -> str: ... -def mirrored(__chr: str) -> int: ... -def name(__chr: str, __default: _default=...) -> Union[str, _default]: ... -def normalize(__form: str, __unistr: str) -> str: ... -def numeric(__chr: str, __default: _default=...) -> Union[float, _default]: ... - -class UCD: - unidata_version = ... # type: str - def bidirectional(self, __chr: str) -> str: ... - def category(self, __chr: str) -> str: ... - def combining(self, __chr: str) -> int: ... - def decimal(self, __chr: str, __default: _default=...) -> Union[int, _default]: ... - def decomposition(self, __chr: str) -> str: ... - def digit(self, __chr: str, __default: _default=...) -> Union[int, _default]: ... - def east_asian_width(self, __chr: str) -> str: ... - def lookup(self, __name: Union[str, bytes]) -> str: ... - def mirrored(self, __chr: str) -> int: ... - def name(self, __chr: str, __default: _default=...) -> Union[str, _default]: ... - def normalize(self, __form: str, __unistr: str) -> str: ... - def numeric(self, __chr: str, __default: _default=...) -> Union[float, _default]: ...