From 8985d897a2893afd5474a80c31675d8fc1b3d00e Mon Sep 17 00:00:00 2001 From: Wesley Batista Date: Mon, 24 Oct 2016 09:27:47 -0200 Subject: [PATCH 1/3] Fix indentation --- ContentTableHandler.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ContentTableHandler.py b/ContentTableHandler.py index c030350..3d0b6cc 100644 --- a/ContentTableHandler.py +++ b/ContentTableHandler.py @@ -32,7 +32,7 @@ def _get_dataframe(self): if isinstance(e, IOError): exception = IOError("{}. Please make sure we are using absolute paths".format(e.message)) raise exception - + self.DF = self._prettify_header(self.DF) return self.DF @@ -40,11 +40,11 @@ def _get_dataframe(self): def _get_dataframe_sum(self): columns_types = self.DF.dtypes - num_cols = [] - for index, value in columns_types.iteritems(): - if value != 'object': - num_cols.append(index) - df_sum = self.DF[num_cols].sum() + num_cols = [] + for index, value in columns_types.iteritems(): + if value != 'object': + num_cols.append(index) + df_sum = self.DF[num_cols].sum() self.DF_SUM = pd.DataFrame(data=df_sum) return self.DF_SUM From 81979ff626a101381422a02b37bc30b8cfb7afc1 Mon Sep 17 00:00:00 2001 From: Wesley Batista Date: Mon, 24 Oct 2016 09:35:54 -0200 Subject: [PATCH 2/3] Fix code style in ContentTableHandler --- ContentTableHandler.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ContentTableHandler.py b/ContentTableHandler.py index 3d0b6cc..8764b24 100644 --- a/ContentTableHandler.py +++ b/ContentTableHandler.py @@ -20,7 +20,7 @@ def _prettify_header(self, df): header = df.columns rename = {} for column in header: - rename[column] = (column.title().replace('_',' ')) + rename[column] = (column.title().replace('_', ' ')) df.rename(columns=rename, inplace=True) return df @@ -30,7 +30,9 @@ def _get_dataframe(self): self.DF = pd.read_csv(self.src, delimiter='|') except Exception as e: if isinstance(e, IOError): - exception = IOError("{}. Please make sure we are using absolute paths".format(e.message)) + exception = IOError("{}. Please make sure we are using " + "absolute paths" + .format(e.message)) raise exception self.DF = self._prettify_header(self.DF) @@ -50,18 +52,19 @@ def _get_dataframe_sum(self): return self.DF_SUM def _get_df_html(self, df, **kwargs): - html_out = df.to_html(**kwargs).replace('border="1"','border="0"') + html_out = df.to_html(**kwargs).replace('border="1"', 'border="0"') return html_out def _get_table_html(self): - result = self._get_df_html(self.DF, index=False, classes='table table-striped detailed') + result = self._get_df_html(self.DF, index=False, + classes='table table-striped detailed') return result def _get_table_meta_html(self): - result = self._get_df_html(self.DF_SUM, header=False, classes='table meta-info') + result = self._get_df_html(self.DF_SUM, header=False, + classes='table meta-info') return result - def get_table(self, ): result = { 'meta': self._get_table_meta_html(), From d1a6bc05af2d0461d8168c51d03c87658d64847f Mon Sep 17 00:00:00 2001 From: Wesley Batista Date: Mon, 24 Oct 2016 09:36:39 -0200 Subject: [PATCH 3/3] Fix code style in ContentChartHandler --- ContentChartHandler.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ContentChartHandler.py b/ContentChartHandler.py index 97a7600..73f4f62 100644 --- a/ContentChartHandler.py +++ b/ContentChartHandler.py @@ -15,7 +15,6 @@ def __init__(self, src, x_label, y_label, **kwargs): self.x_label = x_label self.y_label = y_label - def get_plot_image(self, **kwargs): output = tempfile.mkstemp(suffix='.png')[1] @@ -25,10 +24,11 @@ def get_plot_image(self, **kwargs): df = pd.read_csv(self.src, delimiter='|', index_col=[0], header=0) except Exception as e: if isinstance(e, IOError): - exception = IOError("{}. Please make sure we are using absolute paths".format(e.message)) + exception = IOError("{}. Please make sure we are using " + "absolute paths" + .format(e.message)) raise exception - # generate the plot params = { 'kind': 'bar', @@ -46,7 +46,8 @@ def get_plot_image(self, **kwargs): for idx, label in enumerate(list(df.index)): for acc in df.columns: value = np.round(df.ix[idx][acc], decimals=2) - plot.annotate(value, (idx, value), xytext=(0, 15), textcoords='offset points') + plot.annotate(value, (idx, value), xytext=(0, 15), + textcoords='offset points') # set the labels plot.set_ylabel(self.y_label) @@ -57,4 +58,3 @@ def get_plot_image(self, **kwargs): fig.savefig(output) return output -