Change all strings to unicode

ericmuijs · Jan 10, 2016 · 796dce2 · 796dce2
1 parent fabd447
commit 796dce2
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/pandas_profiling/__init__.py b/pandas_profiling/__init__.py
@@ -247,20 +247,19 @@ def format_row(freq, label, extra_class=''):
     overview_html = templates.overview_template.format({k: fmt(v, k) for k, v in stats_object['table'].iteritems()})
 
     # Variables
-    rows_html = ""
+    rows_html = u""
     for idx, row in stats_object['variables'].iterrows():
 
         formatted_values = {'varname': idx, 'varid': hash(idx)}
 
         for col, value in row.iteritems():
-            formatted_values[col] = fmt(value, col)
+            formatted_values[col] = unicode(fmt(value, col))
 
         if row['type'] == 'CAT':
             formatted_values['minifreqtable'] = freq_table(stats_object['freq'][idx], stats_object['table']['n'],
                                                            templates.mini_freq_table, templates.mini_freq_table_row, 3)
             formatted_values['freqtable'] = freq_table(stats_object['freq'][idx], stats_object['table']['n'],
                                                        templates.freq_table, templates.freq_table_row, 20)
-
         rows_html += templates.row_templates_dict[row['type']].format(formatted_values)
 
     # Sample

diff --git a/pandas_profiling/formatters.py b/pandas_profiling/formatters.py
@@ -8,10 +8,10 @@ def LerpColour(c1,c2,t):
 
 
 def fmt_color(text, color):
-    return('<span style="color:{color}">{text}</span>'.format(color=color,text=str(text)))
+    return(u'<span style="color:{color}">{text}</span>'.format(color=color,text=str(text)))
 
 def fmt_class(text, cls):
-    return('<span class="{cls}">{text}</span>'.format(cls=cls,text=str(text)))
+    return(u'<span class="{cls}">{text}</span>'.format(cls=cls,text=str(text)))
 
 def fmt_bytesize(num, suffix='B'):
     for unit in ['','Ki','Mi','Gi','Ti','Pi','Ei','Zi']:
@@ -25,7 +25,7 @@ def fmt_percent(v):
 
 formatters={
             u'freq': (lambda v: gradient_format(v, 0, 62000, (30, 198, 244), (99, 200, 72))),
-         u'p_missing': lambda v: fmt_class("0%", "notimportant") if v == 0 else "{:2.1f}%".format(v*100),
+         u'p_missing': lambda v: fmt_class(u"0%", "notimportant") if v == 0 else "{:2.1f}%".format(v*100),
         u'p_unique': fmt_percent,
         u'p_zeroes': fmt_percent ,
         u'memorysize': fmt_bytesize,

diff --git a/pandas_profiling/templates.py b/pandas_profiling/templates.py
@@ -1,4 +1,4 @@
-base_html='''
+base_html=u'''
     <meta charset="UTF-8">
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css"
           integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
@@ -52,7 +52,7 @@
             font-weight: 600;
         }
 
-        .stats tr{
+        .stats tr {
             border: 0;
         }
 
@@ -213,7 +213,7 @@
 
 '''
 
-wrapper_html = '''
+wrapper_html = u'''
 <!doctype html>
 
 <html lang="en">
@@ -240,7 +240,7 @@
 '''
 
 
-sample_html = '''
+sample_html = u'''
     <div class="row variablerow">
         <div class="col-md-12" style="overflow:scroll; width: 100%%; overflow-y: hidden;">
                 {sample_table_html}
@@ -289,21 +289,21 @@
      </div>
 '''
 
-_row_header = '''<div class="row variablerow">
+_row_header = u'''<div class="row variablerow">
         <div class="col-md-3 namecol">
             <p class="h4">{varname}<br/><small>{vartype}</small></p>
         </div>
 '''
-_row_header_ignore = '''<div class="row variablerow ignore">
+_row_header_ignore = u'''<div class="row variablerow ignore">
         <div class="col-md-3 namecol">
             <p class="h4"><s>{varname}</s><br/><small>{vartype}</small></p>
         </div>
 '''
 
-_row_footer = '''    </div>'''
+_row_footer = u'''    </div>'''
 
 row_templates_dict = {}
-row_templates_dict['NUM'] = _row_header.format(vartype="Numeric", varname="{0[varname]}") + '''
+row_templates_dict['NUM'] = _row_header.format(vartype="Numeric", varname="{0[varname]}") + u'''
         <div class="col-md-6">
             <div class="row">
                 <div class="col-sm-6">
@@ -394,7 +394,7 @@
       </div>
 ''' + _row_footer
 
-row_templates_dict['DATE'] = _row_header.format(vartype="Date", varname="{0[varname]}") + '''
+row_templates_dict['DATE'] = _row_header.format(vartype="Date", varname="{0[varname]}") + u'''
         <div class="col-md-6">
             <HEADER></HEADER>
             <div class="row">
@@ -426,7 +426,7 @@
 
 row_templates_dict['DISCRETE'] = row_templates_dict['NUM']
 
-row_templates_dict['CAT'] = _row_header.format(vartype="Categorical, low cardinality", varname="{0[varname]}") + '''
+row_templates_dict['CAT'] = _row_header.format(vartype="Categorical, low cardinality", varname="{0[varname]}") + u'''
        <div class="col-md-3">
 
             <table class="stats ">
@@ -453,7 +453,7 @@
          {0[freqtable]}
 ''' + _row_footer
 
-row_templates_dict['UNIQUE'] = _row_header.format(vartype="Unique ID", varname="{0[varname]}") + '''
+row_templates_dict['UNIQUE'] = _row_header.format(vartype="Unique ID", varname="{0[varname]}") + u'''
   <div class="col-md-6">
             <HEADER></HEADER>
             <div class="row">
@@ -470,7 +470,7 @@
         <div class="col-md-3">Example values</div>
 ''' + _row_footer
 
-row_templates_dict['CONST'] = _row_header_ignore.format(vartype="Constant", varname="{0[varname]}") + '''
+row_templates_dict['CONST'] = _row_header_ignore.format(vartype="Constant", varname="{0[varname]}") + u'''
          <div class="col-md-3">
             <p> <em>This variable is constant and should be ignored for analysis</em></p>
 
@@ -484,14 +484,14 @@
 ''' + _row_footer
 
 
-mini_freq_table = '''
+mini_freq_table = u'''
         <div class="col-md-6 collapse in"  id="minifreqtable{varid}">
             <table class="mini freq">
                 {rows}
             </table>
         </div>
 '''
-mini_freq_table_row = '''<tr class="{extra_class}">
+mini_freq_table_row = u'''<tr class="{extra_class}">
                     <th>{label}</th>
                      <td>
                           <div class="bar" style="width:{width}%" data-toggle="tooltip" data-placement="right" data-html="true" data-delay=500 title="Count: {count} <br> Percentage: {percentage}%">
@@ -501,7 +501,7 @@
                 </tr>
 '''
 
-freq_table = '''
+freq_table = u'''
       <div class="row extrapadding">
                  <div class="col-md-12 collapse" id="freqtable{varid}">
                     <table class="freq table table-hover">
@@ -518,7 +518,7 @@
              </div>
         </div>
 '''
-freq_table_row = '''
+freq_table_row = u'''
 <tr class="{extra_class}">
         <td class="fillremaining">{label}</td>
         <td class="number">{count}</td>