restrict shape in variable loading

IanMatthewHuff · IanMatthewHuff · commit d39b4f2844ba · 2019-04-25T15:03:35.000-07:00
diff --git a/news/2 Fixes/5387.md b/news/2 Fixes/5387.md
@@ -0,0 +1 @@
+Value 'None' sometimes shows up in the Count column of the variable explorer
diff --git a/pythonFiles/datascience/getJupyterVariableValue.py b/pythonFiles/datascience/getJupyterVariableValue.py
@@ -10,7 +10,12 @@
 # Find shape and count if available
 if (hasattr(_VSCODE_evalResult, 'shape')):
     try:
-        _VSCODE_targetVariable['shape'] = str(_VSCODE_evalResult.shape)
+        # Get a bit more restrictive with exactly what we want to count as a shape, since anything can define it
+        if isinstance(_VSCODE_evalResult.shape, tuple):
+            _VSCODE_shapeStr = str(_VSCODE_evalResult.shape)
+            if len(_VSCODE_shapeStr) >= 3 and _VSCODE_shapeStr[0] == '(' and _VSCODE_shapeStr[-1] == ')' and ',' in _VSCODE_shapeStr:
+                _VSCODE_targetVariable['shape'] = _VSCODE_shapeStr
+            del _VSCODE_shapeStr
     except TypeError:
         pass
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Value 'None' sometimes shows up in the Count column of the variable explorer`