Merge lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101 into lp:~openerp-community/openerp-extra/7.0-caldav

Proposed by Marcel van der Boom (HS-Development BV) on 2012-10-31
Status: Merged
Merged at revision: 324
Proposed branch: lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101
Merge into: lp:~openerp-community/openerp-extra/7.0-caldav
Diff against target: 46 lines (+8/-7)
1 file modified
caldav/caldav_node.py (+8/-7)
To merge this branch: bzr merge lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101
Reviewer Review Type Date Requested Status
OpenERP Community (OBSOLETE) 2012-10-31 Pending
Review via email: mp+132307@code.launchpad.net

Description of the change

Typo fix _log -> _logger

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'caldav/caldav_node.py'
2--- caldav/caldav_node.py 2012-07-25 12:05:41 +0000
3+++ caldav/caldav_node.py 2012-10-31 11:48:20 +0000
4@@ -25,6 +25,7 @@
5 from orm_utils import get_last_modified
6 _logger = logging.getLogger(__name__)
7
8+
9 try:
10 from tools.dict_tools import dict_merge2
11 except ImportError:
12@@ -245,27 +246,27 @@
13 for cfe in vevent_filter.childNodes:
14 if cfe.localName == 'time-range':
15 if cfe.getAttribute('start'):
16- _log.warning("Ignore start.. ")
17+ _logger.warning("Ignore start.. ")
18 # No, it won't work in this API
19 #val = cfe.getAttribute('start')
20 #res += [('dtstart','=', cfe)]
21 elif cfe.getAttribute('end'):
22- _log.warning("Ignore end.. ")
23+ _logger.warning("Ignore end.. ")
24 else:
25- _log.debug("Unknown comp-filter: %s.", cfe.localName)
26+ _logger.debug("Unknown comp-filter: %s.", cfe.localName)
27 else:
28- _log.debug("Unknown comp-filter: %s.", vevent_filter.localName)
29+ _logger.debug("Unknown comp-filter: %s.", vevent_filter.localName)
30 else:
31- _log.debug("Unknown filter element: %s.", vcalendar_filter.localName)
32+ _logger.debug("Unknown filter element: %s.", vcalendar_filter.localName)
33 else:
34- _log.debug("Unknown calendar-query element: %s.", filter_child.localName)
35+ _logger.debug("Unknown calendar-query element: %s.", filter_child.localName)
36 return res
37 elif filters.localName == 'calendar-multiget':
38 # this is not the place to process, as it wouldn't support multi-level
39 # hrefs. So, the code is moved to document_webdav/dav_fs.py
40 pass
41 else:
42- _log.debug("Unknown element in REPORT: %s.", filters.localName)
43+ _logger.debug("Unknown element in REPORT: %s.", filters.localName)
44 return res
45
46 def children(self, cr, domain=None):

Subscribers

People subscribed via source and target branches