← Back to branch summary

~openobject-training/+junk/client-training

« back to all changes in this revision

Viewing changes to bin/widget/view/graph_gtk/graph.py

[MERGE]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/widget/view/graph_gtk/graph.py
32
32
import rpc
33
33
import tools
34
34
import tools.datetime_util
35
 
 
 
35
import pytz
36
36
from widget.view import interface
37
37
 
38
38
DT_FORMAT = '%Y-%m-%d'
100
100
                    if m[x].get_client(m):
101
101
                        date = time.strptime(m[x].get_client(m), DHM_FORMAT)
102
102
                        if rpc.session.context.get('tz'):
103
 
                            try:
104
 
                                import pytz
105
 
                                lzone = pytz.timezone(rpc.session.context['tz'])
106
 
                                szone = pytz.timezone(rpc.session.timezone)
107
 
                                dt = DT.datetime(date[0], date[1], date[2], date[3], date[4], date[5], date[6])
108
 
                                sdt = szone.localize(dt, is_dst=True)
109
 
                                ldt = sdt.astimezone(lzone)
110
 
                                date = ldt.timetuple()
111
 
                            except:
112
 
                                #ignore and consider client is in server TZ
113
 
                                pass
 
103
                            lzone = pytz.timezone(rpc.session.context['tz'])
 
104
                            szone = pytz.timezone(rpc.session.timezone)
 
105
                            dt = DT.datetime(date[0], date[1], date[2], date[3], date[4], date[5], date[6])
 
106
                            sdt = szone.localize(dt, is_dst=True)
 
107
                            ldt = sdt.astimezone(lzone)
 
108
                            date = ldt.timetuple()
114
109
                        res[x] = time.strftime(LDFMT + ' %H:%M:%S', date)
115
110
                    else:
116
111
                        res[x] = ''