diff -r 53974a06d646 -r dd96b877879d sobjects/cwxmlparser.py --- a/sobjects/cwxmlparser.py Tue Jan 14 17:30:02 2014 +0100 +++ b/sobjects/cwxmlparser.py Tue Dec 17 13:43:56 2013 +0100 @@ -31,8 +31,7 @@ """ -from datetime import datetime, timedelta, time -from urllib import urlencode +from datetime import datetime, time from cgi import parse_qs # in urlparse with python >= 2.6 from logilab.common.date import todate, totime @@ -57,7 +56,7 @@ DEFAULT_CONVERTERS['Date'] = convert_date def convert_datetime(ustr): if '.' in ustr: # assume %Y-%m-%d %H:%M:%S.mmmmmm - ustr = ustr.split('.',1)[0] + ustr = ustr.split('.', 1)[0] return datetime.strptime(ustr, '%Y-%m-%d %H:%M:%S') DEFAULT_CONVERTERS['Datetime'] = convert_datetime # XXX handle timezone, though this will be enough as TZDatetime are @@ -169,7 +168,7 @@ ttype = schemacfg.schema.stype.name etyperules = self.source.mapping.setdefault(etype, {}) etyperules.setdefault((rtype, role, action), []).append( - (ttype, options) ) + (ttype, options)) self.source.mapping_idx[schemacfg.eid] = ( etype, rtype, role, action, ttype) @@ -204,7 +203,7 @@ * `rels` is for relations and structured as {role: {relation: [(related item, related rels)...]} """ - entity = self.extid2entity(str(item['cwuri']), item['cwtype'], + entity = self.extid2entity(str(item['cwuri']), item['cwtype'], cwsource=item['cwsource'], item=item) if entity is None: return None @@ -432,7 +431,7 @@ self._related_link(ttype, others, searchattrs) def _related_link(self, ttype, others, searchattrs): - def issubset(x,y): + def issubset(x, y): return all(z in y for z in x) eids = [] # local eids log = self.parser.import_log