From 061eaf46cf7a636b50d2359b25bee4d691f4c063 Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Fri, 13 Mar 2020 23:49:05 +0530 Subject: [PATCH 1/6] add stubs for language models --- third_party/2and3/chardet/__init__.pyi | 22 ++++++++++ third_party/2and3/chardet/cli/__init__.pyi | 1 + third_party/2and3/chardet/cli/chardetect.py | 4 ++ third_party/2and3/chardet/enums.pyi | 40 +++++++++++++++++++ .../2and3/chardet/langbulgarianmodel.pyi | 8 ++++ .../2and3/chardet/langcyrillicmodel.pyi | 16 ++++++++ third_party/2and3/chardet/langgreekmodel.pyi | 8 ++++ third_party/2and3/chardet/langhebrewmodel.pyi | 6 +++ .../2and3/chardet/langhungarianmodel.pyi | 8 ++++ third_party/2and3/chardet/langthaimodel.pyi | 6 +++ .../2and3/chardet/langturkishmodel.pyi | 6 +++ .../2and3/chardet/universaldetector.pyi | 4 ++ third_party/2and3/chardet/version.pyi | 4 ++ 13 files changed, 133 insertions(+) create mode 100644 third_party/2and3/chardet/cli/__init__.pyi create mode 100644 third_party/2and3/chardet/cli/chardetect.py create mode 100644 third_party/2and3/chardet/enums.pyi create mode 100644 third_party/2and3/chardet/langbulgarianmodel.pyi create mode 100644 third_party/2and3/chardet/langcyrillicmodel.pyi create mode 100644 third_party/2and3/chardet/langgreekmodel.pyi create mode 100644 third_party/2and3/chardet/langhebrewmodel.pyi create mode 100644 third_party/2and3/chardet/langhungarianmodel.pyi create mode 100644 third_party/2and3/chardet/langthaimodel.pyi create mode 100644 third_party/2and3/chardet/langturkishmodel.pyi create mode 100644 third_party/2and3/chardet/version.pyi diff --git a/third_party/2and3/chardet/__init__.pyi b/third_party/2and3/chardet/__init__.pyi index 3caad8946a30..3ac074856f27 100644 --- a/third_party/2and3/chardet/__init__.pyi +++ b/third_party/2and3/chardet/__init__.pyi @@ -1,4 +1,26 @@ +<<<<<<< HEAD +import sys +from typing import Any + +from .universaldetector import UniversalDetector as UniversalDetector + +def __getattr__(name: str) -> Any: ... # incomplete + +if sys.version_info >= (3, 8): + from typing import TypedDict +else: + from typing_extensions import TypedDict + +class _ModelType(TypedDict): + char_to_order_map: Tuple[int] + precedence_matrix: Tuple[int] + typical_positive_ratio: float + keep_english_letter: bool + charset_name: str + language: str +======= from typing import Any from .universaldetector import UniversalDetector as UniversalDetector def __getattr__(name: str) -> Any: ... # incomplete +>>>>>>> b44cd294c4f6cdb66fdd6c13aebabb10855e7dc2 diff --git a/third_party/2and3/chardet/cli/__init__.pyi b/third_party/2and3/chardet/cli/__init__.pyi new file mode 100644 index 000000000000..8b137891791f --- /dev/null +++ b/third_party/2and3/chardet/cli/__init__.pyi @@ -0,0 +1 @@ + diff --git a/third_party/2and3/chardet/cli/chardetect.py b/third_party/2and3/chardet/cli/chardetect.py new file mode 100644 index 000000000000..876c4fa08fc8 --- /dev/null +++ b/third_party/2and3/chardet/cli/chardetect.py @@ -0,0 +1,4 @@ +from typing import Iterable, List, Optional + +def description_of(lines: Iterable[bytes], name: str = ...) -> str: ... +def main(argv: Optional[List[str]] = ...) -> None: ... diff --git a/third_party/2and3/chardet/enums.pyi b/third_party/2and3/chardet/enums.pyi new file mode 100644 index 000000000000..f5bdc04c1c91 --- /dev/null +++ b/third_party/2and3/chardet/enums.pyi @@ -0,0 +1,40 @@ +class InputState(object): + PURE_ASCII: int + ESC_ASCII: int + HIGH_BYTE: int + +class LanguageFilter(object): + CHINESE_SIMPLIFIED: int + CHINESE_TRADITIONAL: int + JAPANESE: int + KOREAN: int + NON_CJK: int + ALL: int + CHINESE: int + CJK: int + +class ProbingState(object): + DETECTING: int + FOUND_IT: int + NOT_ME: int + +class MachineState(object): + START: int + ERROR: int + ITS_ME: int + +class SequenceLikelihood(object): + NEGATIVE: int + UNLIKELY: int + LIKELY: int + POSITIVE: int + + @classmethod + def get_num_categories(cls) -> int: ... + +class CharacterCategory(object): + UNDEFINED: int + LINE_BREAK: int + SYMBOL: int + DIGIT: int + CONTROL: int diff --git a/third_party/2and3/chardet/langbulgarianmodel.pyi b/third_party/2and3/chardet/langbulgarianmodel.pyi new file mode 100644 index 000000000000..2a2af619763b --- /dev/null +++ b/third_party/2and3/chardet/langbulgarianmodel.pyi @@ -0,0 +1,8 @@ +from typing import Tuple +from . import _ModelType + +Latin5_BulgarianCharToOrderMap: Tuple[int] +win1251BulgarianCharToOrderMap: Tuple[int] +BulgarianLangModel: Tuple[int] +Latin5BulgarianModel: _ModelType +Win1251BulgarianModel: _ModelType diff --git a/third_party/2and3/chardet/langcyrillicmodel.pyi b/third_party/2and3/chardet/langcyrillicmodel.pyi new file mode 100644 index 000000000000..ddce27f273eb --- /dev/null +++ b/third_party/2and3/chardet/langcyrillicmodel.pyi @@ -0,0 +1,16 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +KOI8R_char_to_order_map: Tuple[int] +win1251_char_to_order_map: Tuple[int] +latin5_char_to_order_map: Tuple[int] +macCyrillic_char_to_order_map: Tuple[int] +IBM855_char_to_order_map: Tuple[int] +IBM866_char_to_order_map: Tuple[int] +RussianLangModel: Tuple[int] +Koi8rModel: _ModelType +Win1251CyrillicModel: _ModelType +Latin5CyrillicModel: _ModelType +MacCyrillicModel: _ModelType +Ibm866Model: _ModelType +Ibm855Model: _ModelType diff --git a/third_party/2and3/chardet/langgreekmodel.pyi b/third_party/2and3/chardet/langgreekmodel.pyi new file mode 100644 index 000000000000..a5acdb86b8f4 --- /dev/null +++ b/third_party/2and3/chardet/langgreekmodel.pyi @@ -0,0 +1,8 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +Latin7_char_to_order_map: Tuple[int] +win1253_char_to_order_map: Tuple[int] +GreekLangModel: Tuple[int] +Latin7GreekModel: _ModelType +Win1253GreekModel: _ModelType diff --git a/third_party/2and3/chardet/langhebrewmodel.pyi b/third_party/2and3/chardet/langhebrewmodel.pyi new file mode 100644 index 000000000000..35853af0b72c --- /dev/null +++ b/third_party/2and3/chardet/langhebrewmodel.pyi @@ -0,0 +1,6 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +WIN1255_CHAR_TO_ORDER_MAP: Tuple[int] +HEBREW_LANG_MODEL: Tuple[int] +Win1255HebrewModel: _ModelType diff --git a/third_party/2and3/chardet/langhungarianmodel.pyi b/third_party/2and3/chardet/langhungarianmodel.pyi new file mode 100644 index 000000000000..d3fca7404d91 --- /dev/null +++ b/third_party/2and3/chardet/langhungarianmodel.pyi @@ -0,0 +1,8 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +Latin2_HungarianCharToOrderMap: Tuple[int] +win1250HungarianCharToOrderMap: Tuple[int] +HungarianLangModel: Tuple[int] +Latin2HungarianModel: _ModelType +Win1250HungarianModel: _ModelType diff --git a/third_party/2and3/chardet/langthaimodel.pyi b/third_party/2and3/chardet/langthaimodel.pyi new file mode 100644 index 000000000000..013c37640f9f --- /dev/null +++ b/third_party/2and3/chardet/langthaimodel.pyi @@ -0,0 +1,6 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +TIS620CharToOrderMap: Tuple[int] +ThaiLangModel: Tuple[int] +TIS620ThaiModel: _ModelType diff --git a/third_party/2and3/chardet/langturkishmodel.pyi b/third_party/2and3/chardet/langturkishmodel.pyi new file mode 100644 index 000000000000..340ea63c9ad0 --- /dev/null +++ b/third_party/2and3/chardet/langturkishmodel.pyi @@ -0,0 +1,6 @@ +from typing import Tuple, TypedDict +from . import _ModelType + +Latin5_TurkishCharToOrderMap: Tuple[int] +TurkishLangModel: Tuple[int] +Latin5TurkishModel: _ModelType diff --git a/third_party/2and3/chardet/universaldetector.pyi b/third_party/2and3/chardet/universaldetector.pyi index 2c3250cc25da..2d0f7eae51aa 100644 --- a/third_party/2and3/chardet/universaldetector.pyi +++ b/third_party/2and3/chardet/universaldetector.pyi @@ -1,5 +1,9 @@ import sys +<<<<<<< HEAD +from typing import Dict, Pattern, Optional +======= from typing import Dict, Union, AnyStr, Pattern, Optional +>>>>>>> b44cd294c4f6cdb66fdd6c13aebabb10855e7dc2 from typing_extensions import TypedDict from logging import Logger diff --git a/third_party/2and3/chardet/version.pyi b/third_party/2and3/chardet/version.pyi new file mode 100644 index 000000000000..13b2534d1c2c --- /dev/null +++ b/third_party/2and3/chardet/version.pyi @@ -0,0 +1,4 @@ +from typing import List + +__version__: str +VERSION: List[str] From c7bdfa6c96d5a55b260a1d689fb827f367db6507 Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Fri, 13 Mar 2020 23:55:22 +0530 Subject: [PATCH 2/6] fix syntax error in __init__.pyi --- third_party/2and3/chardet/__init__.pyi | 7 ------- 1 file changed, 7 deletions(-) diff --git a/third_party/2and3/chardet/__init__.pyi b/third_party/2and3/chardet/__init__.pyi index 3ac074856f27..f2169e2f4f11 100644 --- a/third_party/2and3/chardet/__init__.pyi +++ b/third_party/2and3/chardet/__init__.pyi @@ -1,4 +1,3 @@ -<<<<<<< HEAD import sys from typing import Any @@ -18,9 +17,3 @@ class _ModelType(TypedDict): keep_english_letter: bool charset_name: str language: str -======= -from typing import Any -from .universaldetector import UniversalDetector as UniversalDetector - -def __getattr__(name: str) -> Any: ... # incomplete ->>>>>>> b44cd294c4f6cdb66fdd6c13aebabb10855e7dc2 From 22412aa0058f84bb462888628228530a6fc6b198 Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Fri, 13 Mar 2020 23:59:10 +0530 Subject: [PATCH 3/6] fix syntax error in universaldetector.pyi --- third_party/2and3/chardet/universaldetector.pyi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/third_party/2and3/chardet/universaldetector.pyi b/third_party/2and3/chardet/universaldetector.pyi index 2d0f7eae51aa..c68355cb50a3 100644 --- a/third_party/2and3/chardet/universaldetector.pyi +++ b/third_party/2and3/chardet/universaldetector.pyi @@ -1,9 +1,5 @@ import sys -<<<<<<< HEAD from typing import Dict, Pattern, Optional -======= -from typing import Dict, Union, AnyStr, Pattern, Optional ->>>>>>> b44cd294c4f6cdb66fdd6c13aebabb10855e7dc2 from typing_extensions import TypedDict from logging import Logger From 9a5f94ce1de7e8cfdfb37e3149a3153c605f5f82 Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Sat, 14 Mar 2020 00:17:39 +0530 Subject: [PATCH 4/6] remove erroneous imports --- third_party/2and3/chardet/__init__.pyi | 2 +- third_party/2and3/chardet/langcyrillicmodel.pyi | 2 +- third_party/2and3/chardet/langgreekmodel.pyi | 2 +- third_party/2and3/chardet/langhebrewmodel.pyi | 2 +- third_party/2and3/chardet/langhungarianmodel.pyi | 2 +- third_party/2and3/chardet/langthaimodel.pyi | 2 +- third_party/2and3/chardet/langturkishmodel.pyi | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/third_party/2and3/chardet/__init__.pyi b/third_party/2and3/chardet/__init__.pyi index f2169e2f4f11..2d165adcd24c 100644 --- a/third_party/2and3/chardet/__init__.pyi +++ b/third_party/2and3/chardet/__init__.pyi @@ -1,5 +1,5 @@ import sys -from typing import Any +from typing import Any, Tuple from .universaldetector import UniversalDetector as UniversalDetector diff --git a/third_party/2and3/chardet/langcyrillicmodel.pyi b/third_party/2and3/chardet/langcyrillicmodel.pyi index ddce27f273eb..523efe7e6dbb 100644 --- a/third_party/2and3/chardet/langcyrillicmodel.pyi +++ b/third_party/2and3/chardet/langcyrillicmodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType KOI8R_char_to_order_map: Tuple[int] diff --git a/third_party/2and3/chardet/langgreekmodel.pyi b/third_party/2and3/chardet/langgreekmodel.pyi index a5acdb86b8f4..b4efc482d487 100644 --- a/third_party/2and3/chardet/langgreekmodel.pyi +++ b/third_party/2and3/chardet/langgreekmodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType Latin7_char_to_order_map: Tuple[int] diff --git a/third_party/2and3/chardet/langhebrewmodel.pyi b/third_party/2and3/chardet/langhebrewmodel.pyi index 35853af0b72c..d714e582a13d 100644 --- a/third_party/2and3/chardet/langhebrewmodel.pyi +++ b/third_party/2and3/chardet/langhebrewmodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType WIN1255_CHAR_TO_ORDER_MAP: Tuple[int] diff --git a/third_party/2and3/chardet/langhungarianmodel.pyi b/third_party/2and3/chardet/langhungarianmodel.pyi index d3fca7404d91..b1fb88540b90 100644 --- a/third_party/2and3/chardet/langhungarianmodel.pyi +++ b/third_party/2and3/chardet/langhungarianmodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType Latin2_HungarianCharToOrderMap: Tuple[int] diff --git a/third_party/2and3/chardet/langthaimodel.pyi b/third_party/2and3/chardet/langthaimodel.pyi index 013c37640f9f..0f9f7d5c0caa 100644 --- a/third_party/2and3/chardet/langthaimodel.pyi +++ b/third_party/2and3/chardet/langthaimodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType TIS620CharToOrderMap: Tuple[int] diff --git a/third_party/2and3/chardet/langturkishmodel.pyi b/third_party/2and3/chardet/langturkishmodel.pyi index 340ea63c9ad0..bbdab27e1028 100644 --- a/third_party/2and3/chardet/langturkishmodel.pyi +++ b/third_party/2and3/chardet/langturkishmodel.pyi @@ -1,4 +1,4 @@ -from typing import Tuple, TypedDict +from typing import Tuple from . import _ModelType Latin5_TurkishCharToOrderMap: Tuple[int] From 20ad571320696c891a2a400b2dee331fb1f5d1b0 Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Sat, 14 Mar 2020 01:03:09 +0530 Subject: [PATCH 5/6] delete cli directory --- third_party/2and3/chardet/__init__.pyi | 2 +- third_party/2and3/chardet/cli/__init__.pyi | 1 - third_party/2and3/chardet/cli/chardetect.py | 4 ---- third_party/2and3/chardet/langbulgarianmodel.pyi | 6 +++--- third_party/2and3/chardet/langcyrillicmodel.pyi | 14 +++++++------- third_party/2and3/chardet/langgreekmodel.pyi | 6 +++--- third_party/2and3/chardet/langhebrewmodel.pyi | 4 ++-- third_party/2and3/chardet/langhungarianmodel.pyi | 6 +++--- third_party/2and3/chardet/langthaimodel.pyi | 4 ++-- third_party/2and3/chardet/langturkishmodel.pyi | 4 ++-- 10 files changed, 23 insertions(+), 28 deletions(-) delete mode 100644 third_party/2and3/chardet/cli/__init__.pyi delete mode 100644 third_party/2and3/chardet/cli/chardetect.py diff --git a/third_party/2and3/chardet/__init__.pyi b/third_party/2and3/chardet/__init__.pyi index 2d165adcd24c..960130fca764 100644 --- a/third_party/2and3/chardet/__init__.pyi +++ b/third_party/2and3/chardet/__init__.pyi @@ -10,7 +10,7 @@ if sys.version_info >= (3, 8): else: from typing_extensions import TypedDict -class _ModelType(TypedDict): +class _LangModelType(TypedDict): char_to_order_map: Tuple[int] precedence_matrix: Tuple[int] typical_positive_ratio: float diff --git a/third_party/2and3/chardet/cli/__init__.pyi b/third_party/2and3/chardet/cli/__init__.pyi deleted file mode 100644 index 8b137891791f..000000000000 --- a/third_party/2and3/chardet/cli/__init__.pyi +++ /dev/null @@ -1 +0,0 @@ - diff --git a/third_party/2and3/chardet/cli/chardetect.py b/third_party/2and3/chardet/cli/chardetect.py deleted file mode 100644 index 876c4fa08fc8..000000000000 --- a/third_party/2and3/chardet/cli/chardetect.py +++ /dev/null @@ -1,4 +0,0 @@ -from typing import Iterable, List, Optional - -def description_of(lines: Iterable[bytes], name: str = ...) -> str: ... -def main(argv: Optional[List[str]] = ...) -> None: ... diff --git a/third_party/2and3/chardet/langbulgarianmodel.pyi b/third_party/2and3/chardet/langbulgarianmodel.pyi index 2a2af619763b..02439be855eb 100644 --- a/third_party/2and3/chardet/langbulgarianmodel.pyi +++ b/third_party/2and3/chardet/langbulgarianmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType Latin5_BulgarianCharToOrderMap: Tuple[int] win1251BulgarianCharToOrderMap: Tuple[int] BulgarianLangModel: Tuple[int] -Latin5BulgarianModel: _ModelType -Win1251BulgarianModel: _ModelType +Latin5BulgarianModel: _LangModelType +Win1251BulgarianModel: _LangModelType diff --git a/third_party/2and3/chardet/langcyrillicmodel.pyi b/third_party/2and3/chardet/langcyrillicmodel.pyi index 523efe7e6dbb..38bc2ac6f664 100644 --- a/third_party/2and3/chardet/langcyrillicmodel.pyi +++ b/third_party/2and3/chardet/langcyrillicmodel.pyi @@ -1,5 +1,5 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType KOI8R_char_to_order_map: Tuple[int] win1251_char_to_order_map: Tuple[int] @@ -8,9 +8,9 @@ macCyrillic_char_to_order_map: Tuple[int] IBM855_char_to_order_map: Tuple[int] IBM866_char_to_order_map: Tuple[int] RussianLangModel: Tuple[int] -Koi8rModel: _ModelType -Win1251CyrillicModel: _ModelType -Latin5CyrillicModel: _ModelType -MacCyrillicModel: _ModelType -Ibm866Model: _ModelType -Ibm855Model: _ModelType +Koi8rModel: _LangModelType +Win1251CyrillicModel: _LangModelType +Latin5CyrillicModel: _LangModelType +MacCyrillicModel: _LangModelType +Ibm866Model: _LangModelType +Ibm855Model: _LangModelType diff --git a/third_party/2and3/chardet/langgreekmodel.pyi b/third_party/2and3/chardet/langgreekmodel.pyi index b4efc482d487..5e06ef545a80 100644 --- a/third_party/2and3/chardet/langgreekmodel.pyi +++ b/third_party/2and3/chardet/langgreekmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType Latin7_char_to_order_map: Tuple[int] win1253_char_to_order_map: Tuple[int] GreekLangModel: Tuple[int] -Latin7GreekModel: _ModelType -Win1253GreekModel: _ModelType +Latin7GreekModel: _LangModelType +Win1253GreekModel: _LangModelType diff --git a/third_party/2and3/chardet/langhebrewmodel.pyi b/third_party/2and3/chardet/langhebrewmodel.pyi index d714e582a13d..7053e5d602e3 100644 --- a/third_party/2and3/chardet/langhebrewmodel.pyi +++ b/third_party/2and3/chardet/langhebrewmodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType WIN1255_CHAR_TO_ORDER_MAP: Tuple[int] HEBREW_LANG_MODEL: Tuple[int] -Win1255HebrewModel: _ModelType +Win1255HebrewModel: _LangModelType diff --git a/third_party/2and3/chardet/langhungarianmodel.pyi b/third_party/2and3/chardet/langhungarianmodel.pyi index b1fb88540b90..21b5968a736b 100644 --- a/third_party/2and3/chardet/langhungarianmodel.pyi +++ b/third_party/2and3/chardet/langhungarianmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType Latin2_HungarianCharToOrderMap: Tuple[int] win1250HungarianCharToOrderMap: Tuple[int] HungarianLangModel: Tuple[int] -Latin2HungarianModel: _ModelType -Win1250HungarianModel: _ModelType +Latin2HungarianModel: _LangModelType +Win1250HungarianModel: _LangModelType diff --git a/third_party/2and3/chardet/langthaimodel.pyi b/third_party/2and3/chardet/langthaimodel.pyi index 0f9f7d5c0caa..d54b25655091 100644 --- a/third_party/2and3/chardet/langthaimodel.pyi +++ b/third_party/2and3/chardet/langthaimodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType TIS620CharToOrderMap: Tuple[int] ThaiLangModel: Tuple[int] -TIS620ThaiModel: _ModelType +TIS620ThaiModel: _LangModelType diff --git a/third_party/2and3/chardet/langturkishmodel.pyi b/third_party/2and3/chardet/langturkishmodel.pyi index bbdab27e1028..c1990389be81 100644 --- a/third_party/2and3/chardet/langturkishmodel.pyi +++ b/third_party/2and3/chardet/langturkishmodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple -from . import _ModelType +from . import _LangModelType Latin5_TurkishCharToOrderMap: Tuple[int] TurkishLangModel: Tuple[int] -Latin5TurkishModel: _ModelType +Latin5TurkishModel: _LangModelType From 6e087f0834f298a4aac2f9b5f4ad8180f20b65ed Mon Sep 17 00:00:00 2001 From: Julin S <48789920+ju-sh@users.noreply.github.com> Date: Sat, 14 Mar 2020 09:27:04 +0530 Subject: [PATCH 6/6] make tuple types variable length --- third_party/2and3/chardet/__init__.pyi | 11 +++++++++-- third_party/2and3/chardet/langbulgarianmodel.pyi | 6 +++--- third_party/2and3/chardet/langcyrillicmodel.pyi | 14 +++++++------- third_party/2and3/chardet/langgreekmodel.pyi | 6 +++--- third_party/2and3/chardet/langhebrewmodel.pyi | 4 ++-- third_party/2and3/chardet/langhungarianmodel.pyi | 6 +++--- third_party/2and3/chardet/langthaimodel.pyi | 4 ++-- third_party/2and3/chardet/langturkishmodel.pyi | 4 ++-- 8 files changed, 31 insertions(+), 24 deletions(-) diff --git a/third_party/2and3/chardet/__init__.pyi b/third_party/2and3/chardet/__init__.pyi index 960130fca764..54e48f5c7233 100644 --- a/third_party/2and3/chardet/__init__.pyi +++ b/third_party/2and3/chardet/__init__.pyi @@ -11,9 +11,16 @@ else: from typing_extensions import TypedDict class _LangModelType(TypedDict): - char_to_order_map: Tuple[int] - precedence_matrix: Tuple[int] + char_to_order_map: Tuple[int, ...] + precedence_matrix: Tuple[int, ...] typical_positive_ratio: float keep_english_letter: bool charset_name: str language: str + +class _SMModelType(TypedDict): + class_table: Tuple[int, ...] + class_factor: int + state_table: Tuple[int, ...] + char_len_table: Tuple[int, ...] + name: str diff --git a/third_party/2and3/chardet/langbulgarianmodel.pyi b/third_party/2and3/chardet/langbulgarianmodel.pyi index 02439be855eb..9a8abde3a744 100644 --- a/third_party/2and3/chardet/langbulgarianmodel.pyi +++ b/third_party/2and3/chardet/langbulgarianmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple from . import _LangModelType -Latin5_BulgarianCharToOrderMap: Tuple[int] -win1251BulgarianCharToOrderMap: Tuple[int] -BulgarianLangModel: Tuple[int] +Latin5_BulgarianCharToOrderMap: Tuple[int, ...] +win1251BulgarianCharToOrderMap: Tuple[int, ...] +BulgarianLangModel: Tuple[int, ...] Latin5BulgarianModel: _LangModelType Win1251BulgarianModel: _LangModelType diff --git a/third_party/2and3/chardet/langcyrillicmodel.pyi b/third_party/2and3/chardet/langcyrillicmodel.pyi index 38bc2ac6f664..fdeb837cc5cb 100644 --- a/third_party/2and3/chardet/langcyrillicmodel.pyi +++ b/third_party/2and3/chardet/langcyrillicmodel.pyi @@ -1,13 +1,13 @@ from typing import Tuple from . import _LangModelType -KOI8R_char_to_order_map: Tuple[int] -win1251_char_to_order_map: Tuple[int] -latin5_char_to_order_map: Tuple[int] -macCyrillic_char_to_order_map: Tuple[int] -IBM855_char_to_order_map: Tuple[int] -IBM866_char_to_order_map: Tuple[int] -RussianLangModel: Tuple[int] +KOI8R_char_to_order_map: Tuple[int, ...] +win1251_char_to_order_map: Tuple[int, ...] +latin5_char_to_order_map: Tuple[int, ...] +macCyrillic_char_to_order_map: Tuple[int, ...] +IBM855_char_to_order_map: Tuple[int, ...] +IBM866_char_to_order_map: Tuple[int, ...] +RussianLangModel: Tuple[int, ...] Koi8rModel: _LangModelType Win1251CyrillicModel: _LangModelType Latin5CyrillicModel: _LangModelType diff --git a/third_party/2and3/chardet/langgreekmodel.pyi b/third_party/2and3/chardet/langgreekmodel.pyi index 5e06ef545a80..eca4b5dfe2c1 100644 --- a/third_party/2and3/chardet/langgreekmodel.pyi +++ b/third_party/2and3/chardet/langgreekmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple from . import _LangModelType -Latin7_char_to_order_map: Tuple[int] -win1253_char_to_order_map: Tuple[int] -GreekLangModel: Tuple[int] +Latin7_char_to_order_map: Tuple[int, ...] +win1253_char_to_order_map: Tuple[int, ...] +GreekLangModel: Tuple[int, ...] Latin7GreekModel: _LangModelType Win1253GreekModel: _LangModelType diff --git a/third_party/2and3/chardet/langhebrewmodel.pyi b/third_party/2and3/chardet/langhebrewmodel.pyi index 7053e5d602e3..acd71e74555f 100644 --- a/third_party/2and3/chardet/langhebrewmodel.pyi +++ b/third_party/2and3/chardet/langhebrewmodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple from . import _LangModelType -WIN1255_CHAR_TO_ORDER_MAP: Tuple[int] -HEBREW_LANG_MODEL: Tuple[int] +WIN1255_CHAR_TO_ORDER_MAP: Tuple[int, ...] +HEBREW_LANG_MODEL: Tuple[int, ...] Win1255HebrewModel: _LangModelType diff --git a/third_party/2and3/chardet/langhungarianmodel.pyi b/third_party/2and3/chardet/langhungarianmodel.pyi index 21b5968a736b..e1e4ca50c17d 100644 --- a/third_party/2and3/chardet/langhungarianmodel.pyi +++ b/third_party/2and3/chardet/langhungarianmodel.pyi @@ -1,8 +1,8 @@ from typing import Tuple from . import _LangModelType -Latin2_HungarianCharToOrderMap: Tuple[int] -win1250HungarianCharToOrderMap: Tuple[int] -HungarianLangModel: Tuple[int] +Latin2_HungarianCharToOrderMap: Tuple[int, ...] +win1250HungarianCharToOrderMap: Tuple[int, ...] +HungarianLangModel: Tuple[int, ...] Latin2HungarianModel: _LangModelType Win1250HungarianModel: _LangModelType diff --git a/third_party/2and3/chardet/langthaimodel.pyi b/third_party/2and3/chardet/langthaimodel.pyi index d54b25655091..edeb07b2fc92 100644 --- a/third_party/2and3/chardet/langthaimodel.pyi +++ b/third_party/2and3/chardet/langthaimodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple from . import _LangModelType -TIS620CharToOrderMap: Tuple[int] -ThaiLangModel: Tuple[int] +TIS620CharToOrderMap: Tuple[int, ...] +ThaiLangModel: Tuple[int, ...] TIS620ThaiModel: _LangModelType diff --git a/third_party/2and3/chardet/langturkishmodel.pyi b/third_party/2and3/chardet/langturkishmodel.pyi index c1990389be81..a723c1e4a289 100644 --- a/third_party/2and3/chardet/langturkishmodel.pyi +++ b/third_party/2and3/chardet/langturkishmodel.pyi @@ -1,6 +1,6 @@ from typing import Tuple from . import _LangModelType -Latin5_TurkishCharToOrderMap: Tuple[int] -TurkishLangModel: Tuple[int] +Latin5_TurkishCharToOrderMap: Tuple[int, ...] +TurkishLangModel: Tuple[int, ...] Latin5TurkishModel: _LangModelType