Merge lp:~openerp-dev/openobject-client/6.0-bug-750112-xrg into lp:openobject-client/6.0

Proposed by xrg
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-client/6.0-bug-750112-xrg
Merge into: lp:openobject-client/6.0
Diff against target: 38 lines (+0/-6)
1 file modified
bin/widget/view/calendar_gtk/parser.py (+0/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-client/6.0-bug-750112-xrg
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+56117@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

1828. By xrg

calendar_gtk: cleanup imports, remove dependency on mx.DateTime

These imports were identified by pyflakes as redundant. Also, removal
of mx.DateTime breaks last ever reference of Gtk to egenix mx package.
(cherry picked from commit 200841900883893eaacb7b241f1b5fedf57c53f9)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/widget/view/calendar_gtk/parser.py'
2--- bin/widget/view/calendar_gtk/parser.py 2011-02-01 13:58:58 +0000
3+++ bin/widget/view/calendar_gtk/parser.py 2011-04-04 09:49:33 +0000
4@@ -26,19 +26,15 @@
5 import gettext
6 import common
7 import gobject
8-from mx import DateTime
9 from datetime import datetime, date
10
11 from SpiffGtkWidgets import Calendar
12-from datetime import datetime
13 from dateutil.relativedelta import relativedelta
14 import time
15 import math
16
17-import rpc
18 from rpc import RPCProxy
19 import logging
20-import widget.model.field as wmodel_fields
21
22 COLOR_PALETTE = ['#f57900', '#cc0000', '#d400a8', '#75507b', '#3465a4', '#73d216', '#c17d11', '#edd400',
23 '#fcaf3e', '#ef2929', '#ff00c9', '#ad7fa8', '#729fcf', '#8ae234', '#e9b96e', '#fce94f',
24@@ -245,7 +241,6 @@
25 self.display(None)
26
27 def _back_forward(self, widget, type, *args, **argv):
28- relatime = DateTime.RelativeDateTime
29 if self.mode == 'day':
30 self.date = self.date + relativedelta(days=type)
31 if self.mode == 'week':
32@@ -343,7 +338,6 @@
33
34 def refresh(self):
35 t = self.date.timetuple()
36- from tools import ustr
37 from locale import getlocale
38 sysencoding = getlocale()[1]
39