diff --git a/pyglance/glance/compare.py b/pyglance/glance/compare.py index 3c7423ff026f06ce91f8599053acdc12eb81c119..be8083ebdfa12be58e40903e4490341bde6c56c0 100644 --- a/pyglance/glance/compare.py +++ b/pyglance/glance/compare.py @@ -16,6 +16,9 @@ from numpy import * import numpy from urllib import quote +import locale +locale.setlocale(locale.LC_ALL,'') # Initialize our locale + import matplotlib # this is a hack to keep glance from needing pyqt unless you run the gui if "gui" in sys.argv[1:] : diff --git a/pyglance/glance/report.py b/pyglance/glance/report.py index 34ad2ad373e5586f01fd451751d336e0dae2e142..99c58f63668ea0fa399bab5421177a798d6ea4dd 100644 --- a/pyglance/glance/report.py +++ b/pyglance/glance/report.py @@ -15,6 +15,7 @@ from mako.lookup import TemplateLookup import types as types import numpy as np import shutil as shutil +import locale from glance.constants import * @@ -27,6 +28,16 @@ formattingSettings = { np.float32: floatFormat, np.float64: floatFormat } +INT_TYPES = [ + types.IntType, + np.int8, + np.int16, + np.int32, + np.int64, + ] +INT_FMT = '%d' +for t in INT_TYPES: formattingSettings[t] = INT_FMT + # make and save an html page using a mako template, put all the data you need # in the template into the kwargs @@ -53,7 +64,7 @@ def make_formatted_display_string(displayData, customDisplayFormat=None) : if type(displayData) in formattingSettings : if formatStr is None : formatStr = formattingSettings[type(displayData)] - displayString = formatStr % displayData + displayString = locale.format_string(formatStr, displayData, grouping=True) else : displayString = str(displayData)