Fix bugs on python 2.7

- assertRegex is since python 3
- Do not pass fig, ax parameter when binding axesplot

Author: wookayin

tfplot/wrapper.py

@@ -284,8 +284,7 @@ def _wrapped_plot_fn(*args, **kwargs_call):
 
         # (2) body
         if is_axesplot_bind:   # e.g. Axesplot.scatter -> bind 'ax' as self
-            ret = plot_func.__get__(ax)(
-                *args, **merge_kwargs(kwargs_call, fig_ax_kwargs))
+            ret = plot_func.__get__(ax)(*args, **kwargs_call)
         else:
             ret = plot_func(*args, **merge_kwargs(kwargs_call, fig_ax_kwargs))  # TODO conflict??
 

tfplot/wrapper_test.py

@@ -8,6 +8,7 @@
 import types
 import sys
 import os
+import re
 
 import tensorflow as tf
 os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3'  # filter out INFO and WARN logs
@@ -64,7 +65,7 @@ def test_wrap_axesplot_axes(self):
 
         plot_op = tf_scatter([1, 2, 3], [1, 4, 9])
         self._check_plot_op_shape(plot_op)
-        self.assertRegex(plot_op.name, 'scatter(_\d)?:0')
+        self.assertTrue(re.match('scatter(_\d)?:0', plot_op.name))
 
     def test_wrap_axesplot_kwarg(self):
         '''Basic functionality test of tfplot.wrap_axesplot() in successful cases.'''