openerp-community team mailing list archive
-
openerp-community team
-
Mailing list archive
-
Message #01470
[Merge] lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101 into lp:~openerp-community/openerp-extra/7.0-caldav
Marcel van der Boom (HS-Development BV) has proposed merging lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101 into lp:~openerp-community/openerp-extra/7.0-caldav.
Requested reviews:
OpenERP Community (openerp-community)
For more details, see:
https://code.launchpad.net/~mrb/openerp-extra/7.0-caldav-fixes-2012103101/+merge/132307
Typo fix _log -> _logger
--
https://code.launchpad.net/~mrb/openerp-extra/7.0-caldav-fixes-2012103101/+merge/132307
Your team OpenERP Community is requested to review the proposed merge of lp:~mrb/openerp-extra/7.0-caldav-fixes-2012103101 into lp:~openerp-community/openerp-extra/7.0-caldav.
=== modified file 'caldav/caldav_node.py'
--- caldav/caldav_node.py 2012-07-25 12:05:41 +0000
+++ caldav/caldav_node.py 2012-10-31 11:46:30 +0000
@@ -25,6 +25,7 @@
from orm_utils import get_last_modified
_logger = logging.getLogger(__name__)
+
try:
from tools.dict_tools import dict_merge2
except ImportError:
@@ -245,27 +246,27 @@
for cfe in vevent_filter.childNodes:
if cfe.localName == 'time-range':
if cfe.getAttribute('start'):
- _log.warning("Ignore start.. ")
+ _logger.warning("Ignore start.. ")
# No, it won't work in this API
#val = cfe.getAttribute('start')
#res += [('dtstart','=', cfe)]
elif cfe.getAttribute('end'):
- _log.warning("Ignore end.. ")
+ _logger.warning("Ignore end.. ")
else:
- _log.debug("Unknown comp-filter: %s.", cfe.localName)
+ _logger.debug("Unknown comp-filter: %s.", cfe.localName)
else:
- _log.debug("Unknown comp-filter: %s.", vevent_filter.localName)
+ _logger.debug("Unknown comp-filter: %s.", vevent_filter.localName)
else:
- _log.debug("Unknown filter element: %s.", vcalendar_filter.localName)
+ _logger.debug("Unknown filter element: %s.", vcalendar_filter.localName)
else:
- _log.debug("Unknown calendar-query element: %s.", filter_child.localName)
+ _logger.debug("Unknown calendar-query element: %s.", filter_child.localName)
return res
elif filters.localName == 'calendar-multiget':
# this is not the place to process, as it wouldn't support multi-level
# hrefs. So, the code is moved to document_webdav/dav_fs.py
pass
else:
- _log.debug("Unknown element in REPORT: %s.", filters.localName)
+ _logger.debug("Unknown element in REPORT: %s.", filters.localName)
return res
def children(self, cr, domain=None):
Follow ups