rewrite __dir__ for Layout for Py2 compat

Kully · Kully · commit bd31ed8c8f69 · 2018-05-18T15:34:21.000-04:00
diff --git a/_plotly_utils/basevalidators.py b/_plotly_utils/basevalidators.py
@@ -31,7 +31,11 @@
 # back-port of fullmatch from Py3.4+
 def fullmatch(regex, string, flags=0):
     """Emulate python-3.4 re.fullmatch()."""
-    return re.match("(?:" + regex.pattern + r")\Z", string, flags=flags)
+    if 'pattern' in dir(regex):
+        regex_string = regex.pattern
+    else:
+        regex_string = regex
+    return re.match("(?:" + regex_string + r")\Z", string, flags=flags)
 
 
 # Utility functions
diff --git a/makefile b/makefile
@@ -27,11 +27,10 @@ update_default_schema :
                f.close()"
 	@echo "Auto-generating graph objects based on updated default-schema."
 	@echo "Warning: Make sure you are running 'make update_default_schema' with Python 3.6.
-		   Code Generation requires 3.6."
-	#python -c "from codegen import perform_codegen;\
-    #    	   perform_codegen()"
-    python setup.py codegen
-	# python codegen/__init__.py
+		   The code generating scripts requires 3.6 to run."
+	python codegen/__init__.py
+	# TODO: fix code breaking with update_default_schema
+	# python setup.py codegen
 
 install : sync_subs
 	@echo ""
diff --git a/plotly/basedatatypes.py b/plotly/basedatatypes.py
@@ -3569,7 +3569,8 @@ def __dir__(self):
         Custom __dir__ that handles dynamic subplot properties
         """
         # Include any active subplot values
-        return list(super(BaseLayoutHierarchyType, self).__dir__()) + sorted(self._subplotid_props)
+        # return list(super(BaseLayoutHierarchyType, self).__dir__()) + sorted(self._subplotid_props)
+        return list(dir(super(BaseLayoutHierarchyType, self))) + sorted(self._subplotid_props)
 
 
 class BaseTraceHierarchyType(BasePlotlyType):
diff --git a/plotly/tests/test_core/test_offline/test_offline.py b/plotly/tests/test_core/test_offline/test_offline.py
@@ -46,8 +46,7 @@ def _read_html(self, file_url):
             return f.read()
 
     def test_default_plot_generates_expected_html(self):
-        # add uid to data_json for regex search
-        data_json = '\[\{"x": \[1, 2, 3\], "y": \[10, 20, 30\], "type": "scatter", "uid": .+\}\]'
+        data_json = '[{"y": [10, 20, 30], "x": [1, 2, 3], "type": "scatter"'
         layout_json = _json.dumps(
             fig['layout'],
             cls=plotly.utils.PlotlyJSONEncoder)
@@ -57,7 +56,7 @@ def test_default_plot_generates_expected_html(self):
         # I don't really want to test the entire script output, so
         # instead just make sure a few of the parts are in here?
         self.assertIn('Plotly.newPlot', html)  # plot command is in there
-        self.assertTrue(re.search(data_json, html))  # data is in there
+        self.assertIn(data_json, html)  # data is in there
         self.assertIn(layout_json, html)       # so is layout
         self.assertIn(PLOTLYJS, html)          # and the source code
         # and it's an <html> doc
diff --git a/plotly/tests/test_optional/temp-plot.html b/plotly/tests/test_optional/temp-plot.html
diff --git a/plotly/tests/test_optional/test_figure_factory/test_figure_factory.py b/plotly/tests/test_optional/test_figure_factory/test_figure_factory.py
@@ -1983,8 +1983,10 @@ def test_violin_fig(self):
                 exp_violin['data'][i]
             )
 
+        print(test_violin['layout'])
+        print(type(test_violin['layout']))
         self.assert_fig_equal(test_violin['layout'],
-                               exp_violin['layout'])
+                              exp_violin['layout'])
 
 
 class TestFacetGrid(NumpyTestUtilsMixin, TestCase):
diff --git a/temp-plot.html b/temp-plot.html

Original file line number	Diff line number	Diff line change
`@@ -1983,8 +1983,10 @@ def test_violin_fig(self):`
`1983`	`1983`	`exp_violin['data'][i]`
`1984`	`1984`	`)`
`1985`	`1985`
	`1986`	`+ print(test_violin['layout'])`
	`1987`	`+ print(type(test_violin['layout']))`
`1986`	`1988`	`self.assert_fig_equal(test_violin['layout'],`
`1987`		`- exp_violin['layout'])`
	`1989`	`+ exp_violin['layout'])`
`1988`	`1990`
`1989`	`1991`
`1990`	`1992`	`class TestFacetGrid(NumpyTestUtilsMixin, TestCase):`