From c97257d33f4618e2e2d3b2ab646d9b06277a020b Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Wed, 16 Oct 2019 12:37:43 +0530 Subject: [PATCH 1/6] fixed issue of mypy for test_ujson --- pandas/tests/io/json/test_ujson.py | 2 +- setup.cfg | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index d6572ac7b7bfe..603107ebb978f 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -1,7 +1,7 @@ try: import json except ImportError: - import simplejson as json + import simplejson as json # type: ignore import calendar import datetime import decimal diff --git a/setup.cfg b/setup.cfg index 55d25abde585c..d2fe102dfb1fc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -202,9 +202,6 @@ ignore_errors=True [mypy-pandas.tests.indexing.test_loc] ignore_errors=True -[mypy-pandas.tests.io.json.test_ujson] -ignore_errors=True - [mypy-pandas.tests.io.test_sql] ignore_errors=True From e8cc289e5aa9ad0f0d11ca4939d15b74ccfaefb2 Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Wed, 16 Oct 2019 12:49:23 +0530 Subject: [PATCH 2/6] fix pep8 issue --- pandas/tests/io/json/test_ujson.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 603107ebb978f..6778accae128c 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -1,7 +1,7 @@ try: import json except ImportError: - import simplejson as json # type: ignore + import simplejson as json # type: ignore import calendar import datetime import decimal From 4eb2f62c84596b2c481783b3769ef5d695a2414d Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Wed, 16 Oct 2019 15:52:15 +0530 Subject: [PATCH 3/6] added comments for already known issues at mypy --- pandas/tests/io/json/test_ujson.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 6778accae128c..94c2f3944e9be 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -2,6 +2,8 @@ import json except ImportError: import simplejson as json # type: ignore + # https://github.com/python/mypy/issues/1153 + # error: Name 'json' already defined (by an import) import calendar import datetime import decimal From 19df679aa0dfb4d1e21081f26ab6cfb1920d9bd3 Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Wed, 16 Oct 2019 16:45:45 +0530 Subject: [PATCH 4/6] fixed issue black formate --- pandas/tests/io/json/test_ujson.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 94c2f3944e9be..ff83584d18084 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -2,6 +2,7 @@ import json except ImportError: import simplejson as json # type: ignore + # https://github.com/python/mypy/issues/1153 # error: Name 'json' already defined (by an import) import calendar From 4c92c44d5694c0a7240919b3a1e394ffa3190c45 Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Thu, 17 Oct 2019 11:24:08 +0530 Subject: [PATCH 5/6] removed try except block for importing json --- pandas/tests/io/json/test_ujson.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index ff83584d18084..444c9da0d0ea8 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -1,10 +1,4 @@ -try: - import json -except ImportError: - import simplejson as json # type: ignore - - # https://github.com/python/mypy/issues/1153 - # error: Name 'json' already defined (by an import) +import json import calendar import datetime import decimal From 0022d2bea02aaf8697d7aed9f495f5a1c4dfec43 Mon Sep 17 00:00:00 2001 From: iamrajhans Date: Thu, 17 Oct 2019 12:07:41 +0530 Subject: [PATCH 6/6] fixed import sequence --- pandas/tests/io/json/test_ujson.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py index 444c9da0d0ea8..20e2690084e2a 100644 --- a/pandas/tests/io/json/test_ujson.py +++ b/pandas/tests/io/json/test_ujson.py @@ -1,7 +1,7 @@ -import json import calendar import datetime import decimal +import json import locale import math import re