From d0a0c4ca4f94ea7f155e4a1be1b7b5b04e58cdb7 Mon Sep 17 00:00:00 2001 From: Vaibhav Vishal Date: Fri, 29 Mar 2019 10:47:32 +0530 Subject: [PATCH 1/4] fix type annotation for pandas._config.config.py and also remove this module from mypy.ini --- mypy.ini | 3 --- pandas/_config/config.py | 7 ++++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/mypy.ini b/mypy.ini index b7dbf390fa8c9..edd36bd27cf55 100644 --- a/mypy.ini +++ b/mypy.ini @@ -5,9 +5,6 @@ follow_imports=silent [mypy-pandas.conftest,pandas.tests.*] ignore_errors=True -[mypy-pandas._config.config] -ignore_errors=True - [mypy-pandas._version] ignore_errors=True diff --git a/pandas/_config/config.py b/pandas/_config/config.py index 688080311cd33..0ad736dd16314 100644 --- a/pandas/_config/config.py +++ b/pandas/_config/config.py @@ -51,15 +51,16 @@ from collections import namedtuple from contextlib import contextmanager import re +from typing import Dict import warnings DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver') RegisteredOption = namedtuple('RegisteredOption', 'key defval doc validator cb') -_deprecated_options = {} # holds deprecated option metdata -_registered_options = {} # holds registered option metdata -_global_config = {} # holds the current values for registered options +_deprecated_options = {} # type: Dict[str, str] +_registered_options = {} # type: Dict[str, object] +_global_config = {} # type: Dict[str, str] _reserved_keys = ['all'] # keys which have a special meaning From 2e1b14e2eeb86f896587c6870ff3c49b8a9df0c4 Mon Sep 17 00:00:00 2001 From: Vaibhav Vishal Date: Fri, 29 Mar 2019 13:17:21 +0530 Subject: [PATCH 2/4] use proper typing for value of _deprecated_options and _registered_options --- pandas/_config/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pandas/_config/config.py b/pandas/_config/config.py index 0ad736dd16314..cfa95be43c11c 100644 --- a/pandas/_config/config.py +++ b/pandas/_config/config.py @@ -58,8 +58,8 @@ RegisteredOption = namedtuple('RegisteredOption', 'key defval doc validator cb') -_deprecated_options = {} # type: Dict[str, str] -_registered_options = {} # type: Dict[str, object] +_deprecated_options = {} # type: Dict[str, DeprecatedOption] +_registered_options = {} # type: Dict[str, RegisteredOption] _global_config = {} # type: Dict[str, str] _reserved_keys = ['all'] # keys which have a special meaning From 31f66cc4c1fdf5754da90081c86fe37d6ae67df4 Mon Sep 17 00:00:00 2001 From: Vaibhav Vishal Date: Fri, 29 Mar 2019 18:29:02 +0530 Subject: [PATCH 3/4] leave the previous comments there --- pandas/_config/config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pandas/_config/config.py b/pandas/_config/config.py index cfa95be43c11c..292654c21d760 100644 --- a/pandas/_config/config.py +++ b/pandas/_config/config.py @@ -58,8 +58,11 @@ RegisteredOption = namedtuple('RegisteredOption', 'key defval doc validator cb') +# holds deprecated option metdata _deprecated_options = {} # type: Dict[str, DeprecatedOption] +# holds registered option metdata _registered_options = {} # type: Dict[str, RegisteredOption] +# holds the current values for registered options _global_config = {} # type: Dict[str, str] _reserved_keys = ['all'] # keys which have a special meaning From cc72f5b898c9dfde13fbd7ea6818dd13a81334c3 Mon Sep 17 00:00:00 2001 From: Vaibhav Vishal Date: Sun, 31 Mar 2019 19:06:43 +0530 Subject: [PATCH 4/4] type variable _reserved_keys too and fix forrnatting --- pandas/_config/config.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pandas/_config/config.py b/pandas/_config/config.py index 292654c21d760..0bbc6ba8c519a 100644 --- a/pandas/_config/config.py +++ b/pandas/_config/config.py @@ -51,7 +51,7 @@ from collections import namedtuple from contextlib import contextmanager import re -from typing import Dict +from typing import Dict, List import warnings DeprecatedOption = namedtuple('DeprecatedOption', 'key msg rkey removal_ver') @@ -60,11 +60,15 @@ # holds deprecated option metdata _deprecated_options = {} # type: Dict[str, DeprecatedOption] + # holds registered option metdata _registered_options = {} # type: Dict[str, RegisteredOption] + # holds the current values for registered options _global_config = {} # type: Dict[str, str] -_reserved_keys = ['all'] # keys which have a special meaning + +# keys which have a special meaning +_reserved_keys = ['all'] # type: List[str] class OptionError(AttributeError, KeyError):