Fix for Python 4: replace unsafe six.PY3 with PY2

Author: hugovk

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_get_figure/test_get_figure.py

@@ -99,7 +99,7 @@ def test_get_figure_raw(self):
 
 
 class TestBytesVStrings(PlotlyTestCase):
-    @skipIf(not six.PY3, "Decoding and missing escapes only seen in PY3")
+    @skipIf(six.PY2, "Decoding and missing escapes only seen in PY3")
     def test_proper_escaping(self):
         un = "PlotlyImageTest"
         ak = "786r5mecv0"

packages/python/chart-studio/chart_studio/tests/test_plot_ly/test_get_requests/test_get_requests.py

@@ -36,10 +36,10 @@ def test_user_does_not_exist(self):
         hd["plotly-apikey"] = api_key
         resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
         response = requests.get(server + resource, headers=hd)
-        if six.PY3:
-            content = _json.loads(response.content.decode("unicode_escape"))
-        else:
+        if six.PY2:
             content = _json.loads(response.content)
+        else:
+            content = _json.loads(response.content.decode("unicode_escape"))
         error_message = (
             "Aw, snap! We don't have an account for {0}. Want to "
             "try again? Sign in is not case sensitive.".format(username)
@@ -58,10 +58,10 @@ def test_file_does_not_exist(self):
         hd["plotly-apikey"] = api_key
         resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
         response = requests.get(server + resource, headers=hd)
-        if six.PY3:
-            content = _json.loads(response.content.decode("unicode_escape"))
-        else:
+        if six.PY2:
             content = _json.loads(response.content)
+        else:
+            content = _json.loads(response.content.decode("unicode_escape"))
         error_message = (
             "Aw, snap! It looks like this file does " "not exist. Want to try again?"
         )
@@ -96,10 +96,10 @@ def test_private_permission_defined(self):
         hd["plotly-apikey"] = api_key
         resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
         response = requests.get(server + resource, headers=hd)
-        if six.PY3:
-            content = _json.loads(response.content.decode("unicode_escape"))
-        else:
+        if six.PY2:
             content = _json.loads(response.content)
+        else:
+            content = _json.loads(response.content.decode("unicode_escape"))
         self.assertEqual(response.status_code, 403)
 
     # Private File that is shared
@@ -115,10 +115,10 @@ def test_missing_headers(self):
             hd = copy.copy(default_headers)
             del hd[header]
             response = requests.get(server + resource, headers=hd)
-            if six.PY3:
-                content = _json.loads(response.content.decode("unicode_escape"))
-            else:
+            if six.PY2:
                 content = _json.loads(response.content)
+            else:
+                content = _json.loads(response.content.decode("unicode_escape"))
             self.assertEqual(response.status_code, 422)
 
     @attr("slow")
@@ -132,10 +132,10 @@ def test_valid_request(self):
         hd["plotly-apikey"] = api_key
         resource = "/apigetfile/{0}/{1}/".format(file_owner, file_id)
         response = requests.get(server + resource, headers=hd)
-        if six.PY3:
-            content = _json.loads(response.content.decode("unicode_escape"))
-        else:
+        if six.PY2:
             content = _json.loads(response.content)
+        else:
+            content = _json.loads(response.content.decode("unicode_escape"))
         self.assertEqual(response.status_code, 200)
         # content = _json.loads(res.content)
         # response_payload = content['payload']

packages/python/plotly/plotly/basedatatypes.py

@@ -4458,12 +4458,7 @@ def __dir__(self):
         Custom __dir__ that handles dynamic subplot properties
         """
         # Include any active subplot values
-        if six.PY3:
-            return list(super(BaseLayoutHierarchyType, self).__dir__()) + sorted(
-                self._subplotid_props
-            )
-        else:
-
+        if six.PY2:
             def get_attrs(obj):
                 import types
 
@@ -4493,6 +4488,11 @@ def dir2(obj):
                 return list(attrs)
 
             return dir2(self) + sorted(self._subplotid_props)
+        else:
+
+            return list(super(BaseLayoutHierarchyType, self).__dir__()) + sorted(
+                self._subplotid_props
+            )
 
 
 class BaseTraceHierarchyType(BasePlotlyType):