From 7efaef8d140bc64d63564a762094884b75563686 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 5 Jun 2019 21:31:30 +0200 Subject: [PATCH 1/4] Fix deletion of temp variables in main namespace (left-over from GH26665) --- pandas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index 11ea3047bb62a..712f19bf3b977 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -17,7 +17,7 @@ for dependency, e in missing_dependencies: msg += "\n{0}: {1}".format(dependency, str(e)) raise ImportError(msg) -del hard_dependencies, dependency, missing_dependencies +del hard_dependencies, dependency, e, missing_dependencies, msg # numpy compat from pandas.compat.numpy import ( From f420e64cc77de88d11652822a44f05a41fb83f81 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 5 Jun 2019 21:38:35 +0200 Subject: [PATCH 2/4] try fix --- pandas/__init__.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index 712f19bf3b977..1a9847e585c37 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -10,14 +10,16 @@ try: __import__(dependency) except ImportError as e: - missing_dependencies.append((dependency, e)) + missing_dependencies.append( + "\n{0}: {1}".format(dependency, str(e)) + ) if missing_dependencies: msg = "Unable to import required dependencies:" - for dependency, e in missing_dependencies: - msg += "\n{0}: {1}".format(dependency, str(e)) + msg += "".join(missing_dependencies) raise ImportError(msg) -del hard_dependencies, dependency, e, missing_dependencies, msg + del msg +del hard_dependencies, dependency, missing_dependencies # numpy compat from pandas.compat.numpy import ( From 6452ccf97ef5adfa2269c0df7b41ace7275f0939 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 5 Jun 2019 21:39:16 +0200 Subject: [PATCH 3/4] lint --- pandas/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index 1a9847e585c37..87400c28c0107 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -11,7 +11,7 @@ __import__(dependency) except ImportError as e: missing_dependencies.append( - "\n{0}: {1}".format(dependency, str(e)) + "\n{0}: {1}".format(dependency, str(e)) ) if missing_dependencies: From 7c262644565809bddb50b5125d7802ac79335f08 Mon Sep 17 00:00:00 2001 From: Joris Van den Bossche Date: Wed, 5 Jun 2019 22:30:10 +0200 Subject: [PATCH 4/4] another try --- pandas/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pandas/__init__.py b/pandas/__init__.py index 87400c28c0107..eba67884d5037 100644 --- a/pandas/__init__.py +++ b/pandas/__init__.py @@ -18,7 +18,6 @@ msg = "Unable to import required dependencies:" msg += "".join(missing_dependencies) raise ImportError(msg) - del msg del hard_dependencies, dependency, missing_dependencies # numpy compat