diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index fcf1ee92ebd..7cb0e387710 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -514,7 +514,7 @@ class ir_model_constraint(Model): # double-check we are really going to delete all the owners of this schema element cr.execute("""SELECT id from ir_model_constraint where name=%s""", (data.name,)) external_ids = [x[0] for x in cr.fetchall()] - if (set(external_ids)-ids_set): + if set(external_ids)-ids_set: # as installed modules have defined this element we must not delete it! continue @@ -573,7 +573,7 @@ class ir_model_relation(Model): # double-check we are really going to delete all the owners of this schema element cr.execute("""SELECT id from ir_model_relation where name = %s""", (data.name,)) external_ids = [x[0] for x in cr.fetchall()] - if (set(external_ids)-ids_set): + if set(external_ids)-ids_set: # as installed modules have defined this element we must not delete it! continue @@ -585,7 +585,7 @@ class ir_model_relation(Model): # drop m2m relation tables for table in to_drop_table: - cr.execute('DROP TABLE %s CASCADE'% (table),) + cr.execute('DROP TABLE %s CASCADE'% table,) _logger.info('Dropped table %s', table) cr.commit() @@ -862,7 +862,7 @@ class ir_model_data(osv.osv): res = self.read(cr, uid, data_id, ['model', 'res_id']) if not res['res_id']: raise ValueError('No such external ID currently defined in the system: %s.%s' % (module, xml_id)) - return (res['model'], res['res_id']) + return res['model'], res['res_id'] def get_object(self, cr, uid, module, xml_id, context=None): """Returns a browsable record for the given module name and xml_id or raise ValueError if not found""" @@ -903,7 +903,7 @@ class ir_model_data(osv.osv): # records created during module install should not display the messages of OpenChatter context = dict(context, install_mode=True) if xml_id and ('.' in xml_id): - assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % (xml_id) + assert len(xml_id.split('.'))==2, _("'%s' contains too many dots. XML ids should not contain dots ! These are used to refer to other modules data, as in module.reference_id") % xml_id module, xml_id = xml_id.split('.') if (not xml_id) and (not self.doinit): return False diff --git a/openerp/addons/base/ir/ir_translation.py b/openerp/addons/base/ir/ir_translation.py index f3985045fb2..f9983b5878b 100644 --- a/openerp/addons/base/ir/ir_translation.py +++ b/openerp/addons/base/ir/ir_translation.py @@ -134,7 +134,7 @@ class ir_translation_import_cursor(object): """ % (self._parent_table, self._table_name, self._parent_table, find_expr)) if self._debug: - cr.execute('SELECT COUNT(*) FROM ONLY %s' % (self._parent_table)) + cr.execute('SELECT COUNT(*) FROM ONLY %s' % self._parent_table) c1 = cr.fetchone()[0] cr.execute('SELECT COUNT(*) FROM ONLY %s AS irt, %s AS ti WHERE %s' % \ (self._parent_table, self._table_name, find_expr)) diff --git a/openerp/addons/base/ir/workflow/print_instance.py b/openerp/addons/base/ir/workflow/print_instance.py index c9f1dc1c97e..2ac677b194e 100644 --- a/openerp/addons/base/ir/workflow/print_instance.py +++ b/openerp/addons/base/ir/workflow/print_instance.py @@ -101,11 +101,11 @@ def graph_get(cr, graph, wkf_ids, nested, workitem, processed_subflows): start = cr.fetchone()[0] cr.execute("select 'subflow.'||name,id from wkf_activity where flow_stop=True and wkf_id in ("+','.join(['%s']*len(wkf_ids))+')', wkf_ids) stop = cr.fetchall() - if (stop): + if stop: stop = (stop[0][1], dict(stop)) else: stop = ("stop",{}) - return ((start,{}),stop) + return (start, {}), stop def graph_instance_get(cr, graph, inst_id, nested=False): @@ -208,13 +208,13 @@ class report_graph(report.interface.report_int): def result(self): if self.obj.is_done(): - return (True, self.obj.get(), 'pdf') + return True, self.obj.get(), 'pdf' else: - return (False, False, False) + return False, False, False def create(self, cr, uid, ids, data, context=None): self.obj = report_graph_instance(cr, uid, ids, data) - return (self.obj.get(), 'pdf') + return self.obj.get(), 'pdf' report_graph('report.workflow.instance.graph', 'ir.workflow') diff --git a/openerp/addons/base/res/res_config.py b/openerp/addons/base/res/res_config.py index 1aa108c14d2..98c5ca7e6af 100644 --- a/openerp/addons/base/res/res_config.py +++ b/openerp/addons/base/res/res_config.py @@ -309,7 +309,7 @@ class res_config_installer(osv.osv_memory): hooks_results = set() for module in base: - hook = getattr(self, '_if_%s'%(module), None) + hook = getattr(self, '_if_%s'% module, None) if hook: hooks_results.update(hook(cr, uid, ids, context=None) or set()) diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py index c1f4bd0b5c3..a95ac454057 100644 --- a/openerp/addons/base/res/res_currency.py +++ b/openerp/addons/base/res/res_currency.py @@ -99,7 +99,7 @@ class res_currency(osv.osv): res = super(res_currency, self).read(cr, user, ids, fields, context, load) currency_rate_obj = self.pool.get('res.currency.rate') values = res - if not isinstance(values, (list)): + if not isinstance(values, list): values = [values] for r in values: if r.__contains__('rate_ids'): @@ -217,7 +217,7 @@ class res_currency(osv.osv): if round: return self.round(cr, uid, to_currency, from_amount * rate) else: - return (from_amount * rate) + return from_amount * rate res_currency() diff --git a/openerp/addons/base/res/res_lang.py b/openerp/addons/base/res/res_lang.py index 6c62877a89a..5f39a7cb703 100644 --- a/openerp/addons/base/res/res_lang.py +++ b/openerp/addons/base/res/res_lang.py @@ -168,7 +168,7 @@ class lang(osv.osv): thousands_sep = lang_obj.thousands_sep or conv[monetary and 'mon_thousands_sep' or 'thousands_sep'] decimal_point = lang_obj.decimal_point grouping = lang_obj.grouping - return (grouping, thousands_sep, decimal_point) + return grouping, thousands_sep, decimal_point def write(self, cr, uid, ids, vals, context=None): for lang_id in ids : @@ -231,7 +231,7 @@ lang() def original_group(s, grouping, thousands_sep=''): if not grouping: - return (s, 0) + return s, 0 result = "" seps = 0 diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py index 07dba6b0d32..e44f6340fc8 100644 --- a/openerp/addons/base/res/res_partner.py +++ b/openerp/addons/base/res/res_partner.py @@ -309,7 +309,7 @@ class res_partner(osv.osv, format_address): if default is None: default = {} name = self.read(cr, uid, [id], ['name'], context)[0]['name'] - default.update({'name': _('%s (copy)') % (name)}) + default.update({'name': _('%s (copy)') % name}) return super(res_partner, self).copy(cr, uid, id, default, context) def onchange_type(self, cr, uid, ids, is_company, context=None): @@ -519,7 +519,7 @@ class res_partner(osv.osv, format_address): def view_header_get(self, cr, uid, view_id, view_type, context): res = super(res_partner, self).view_header_get(cr, uid, view_id, view_type, context) if res: return res - if (not context.get('category_id', False)): + if not context.get('category_id', False): return False return _('Partners: ')+self.pool.get('res.partner.category').browse(cr, uid, context['category_id'], context).name diff --git a/openerp/addons/base/res/res_request.py b/openerp/addons/base/res/res_request.py index b1e3bf88505..25db0e43b2e 100644 --- a/openerp/addons/base/res/res_request.py +++ b/openerp/addons/base/res/res_request.py @@ -58,7 +58,7 @@ class res_request(osv.osv): ids = map(lambda x:x[0], cr.fetchall()) cr.execute('select id from res_request where act_from=%s and (act_to<>%s) and (trigger_date<=%s or trigger_date is null) and active=True and state != %s', (uid,uid,time.strftime('%Y-%m-%d'), 'closed')) ids2 = map(lambda x:x[0], cr.fetchall()) - return (ids, ids2) + return ids, ids2 _columns = { 'create_date': fields.datetime('Created Date', readonly=True), diff --git a/openerp/addons/base_quality_interrogation.py b/openerp/addons/base_quality_interrogation.py index a1b03b894e6..e89d2206e1f 100755 --- a/openerp/addons/base_quality_interrogation.py +++ b/openerp/addons/base_quality_interrogation.py @@ -68,10 +68,10 @@ def execute(connector, method, *args): except socket.error,e: if e.args[0] == 111: if wait_count > wait_limit: - print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds."%(wait_limit) + print "Server is taking too long to start, it has exceeded the maximum limit of %d seconds." % wait_limit clean() sys.exit(1) - print 'Please wait %d sec to start server....'%(waittime) + print 'Please wait %d sec to start server....' % waittime wait_count += 1 time.sleep(waittime) res = execute(connector, method, *args) @@ -137,7 +137,7 @@ def check_quality(uri, user, pwd, dbname, modules, quality_logs): detail_html +='''

%s (Score : %s)

%s
%s
'''%(test.replace(' ', '-'), test, score, msg, detail.get('detail', '')) test_detail[test] = (score,msg,detail.get('detail','')) html += "" - html += "%s"%(detail_html) + html += "%s"% detail_html html += "" if not os.path.isdir(quality_logs): os.mkdir(quality_logs) diff --git a/openerp/loglevels.py b/openerp/loglevels.py index f4fa46901dd..f80fd673939 100644 --- a/openerp/loglevels.py +++ b/openerp/loglevels.py @@ -110,7 +110,7 @@ def get_encodings(hint_encoding='utf-8'): # some defaults (also taking care of pure ASCII) for charset in ['utf8','latin1']: - if not (hint_encoding) or (charset.lower() != hint_encoding.lower()): + if not hint_encoding or (charset.lower() != hint_encoding.lower()): yield charset from locale import getpreferredencoding diff --git a/openerp/osv/expression.py b/openerp/osv/expression.py index e14e013d536..43717320a48 100644 --- a/openerp/osv/expression.py +++ b/openerp/osv/expression.py @@ -340,11 +340,11 @@ def generate_table_alias(src_table_alias, joined_tables=[]): """ alias = src_table_alias if not joined_tables: - return ('%s' % alias, '%s' % _quote(alias)) + return '%s' % alias, '%s' % _quote(alias) for link in joined_tables: alias += '__' + link[1] - assert len(alias) < 64, 'Table alias name %s is longer than the 64 characters size accepted by default in postgresql.' % (alias) - return ('%s' % alias, '%s as %s' % (_quote(joined_tables[-1][0]), _quote(alias))) + assert len(alias) < 64, 'Table alias name %s is longer than the 64 characters size accepted by default in postgresql.' % alias + return '%s' % alias, '%s as %s' % (_quote(joined_tables[-1][0]), _quote(alias)) def get_alias_from_query(from_query): @@ -356,9 +356,9 @@ def get_alias_from_query(from_query): """ from_splitted = from_query.split(' as ') if len(from_splitted) > 1: - return (from_splitted[0].replace('"', ''), from_splitted[1].replace('"', '')) + return from_splitted[0].replace('"', ''), from_splitted[1].replace('"', '') else: - return (from_splitted[0].replace('"', ''), from_splitted[0].replace('"', '')) + return from_splitted[0].replace('"', ''), from_splitted[0].replace('"', '') def normalize_leaf(element): @@ -377,7 +377,7 @@ def normalize_leaf(element): if isinstance(right, (list, tuple)) and operator in ('=', '!='): _logger.warning("The domain term '%s' should use the 'in' or 'not in' operator." % ((left, original, right),)) operator = 'in' if operator == '=' else 'not in' - return (left, operator, right) + return left, operator, right def is_operator(element): @@ -829,7 +829,7 @@ class expression(object): push(create_substitution_leaf(leaf, AND_OPERATOR, relational_model)) elif len(field_path) > 1 and field._auto_join: - raise NotImplementedError('_auto_join attribute not supported on many2many field %s' % (left)) + raise NotImplementedError('_auto_join attribute not supported on many2many field %s' % left) elif len(field_path) > 1 and field._type == 'many2one': right_ids = relational_model.search(cr, uid, [(field_path[1], operator, right)], context=context) @@ -989,7 +989,7 @@ class expression(object): res_ids = [x[0] for x in relational_model.name_search(cr, uid, right, [], operator, limit=None, context=c)] if operator in NEGATIVE_TERM_OPERATORS: res_ids.append(False) # TODO this should not be appended if False was in 'right' - return (left, 'in', res_ids) + return left, 'in', res_ids # resolve string-based m2o criterion into IDs if isinstance(right, basestring) or \ right and isinstance(right, (tuple, list)) and all(isinstance(item, basestring) for item in right): @@ -1140,8 +1140,8 @@ class expression(object): query = '%s."%s" IS NOT NULL' % (table_alias, left) params = [] - elif (operator == '=?'): - if (right is False or right is None): + elif operator == '=?': + if right is False or right is None: # '=?' is a short-circuit that makes the term TRUE if right is None or False query = 'TRUE' params = [] @@ -1187,7 +1187,7 @@ class expression(object): if isinstance(params, basestring): params = [params] - return (query, params) + return query, params def to_sql(self): stack = [] @@ -1213,6 +1213,6 @@ class expression(object): if joins: query = '(%s) AND %s' % (joins, query) - return (query, tools.flatten(params)) + return query, tools.flatten(params) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/osv/fields.py b/openerp/osv/fields.py index 52717a40354..51e49f19558 100644 --- a/openerp/osv/fields.py +++ b/openerp/osv/fields.py @@ -668,7 +668,7 @@ class many2many(_column): col1 = '%s_id' % source_model._table if not col2: col2 = '%s_id' % dest_model._table - return (tbl, col1, col2) + return tbl, col1, col2 def _get_query_and_where_params(self, cr, model, ids, values, where_params): """ Extracted from ``get`` to facilitate fine-tuning of the generated diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 07cf4364f6c..ab9b4873f18 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -454,7 +454,7 @@ class browse_record(object): new_data[field_name] = browse_null() elif field_column._type in ('one2many', 'many2many') and len(result_line[field_name]): new_data[field_name] = self._list_class([browse_record(self._cr, self._uid, id, self._table.pool.get(field_column._obj), self._cache, context=self._context, list_class=self._list_class, fields_process=self._fields_process) for id in result_line[field_name]], self._context) - elif field_column._type in ('reference'): + elif field_column._type in 'reference': if result_line[field_name]: if isinstance(result_line[field_name], browse_record): new_data[field_name] = result_line[field_name] @@ -1741,7 +1741,7 @@ class BaseModel(object): views = {} xml = "
" for f in node: - if f.tag in ('field'): + if f.tag in 'field': xml += etree.tostring(f, encoding="utf-8") xml += "
" new_xml = etree.fromstring(encode(xml)) @@ -2010,7 +2010,7 @@ class BaseModel(object): view = etree.Element('calendar', string=self._description) etree.SubElement(view, 'field', self._rec_name_fallback(cr, user, context)) - if (self._date_name not in self._columns): + if self._date_name not in self._columns: date_found = False for dt in ['date', 'date_start', 'x_date', 'x_date_start']: if dt in self._columns: @@ -2031,7 +2031,7 @@ class BaseModel(object): self._columns, 'date_delay'): raise except_orm( _('Invalid Object Architecture!'), - _("Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay" % (self._name))) + _("Insufficient fields to generate a Calendar View for %s, missing a date_stop or a date_delay" % self._name)) return view @@ -3097,7 +3097,7 @@ class BaseModel(object): else: default = self._defaults[k] - if (default is not None): + if default is not None: ss = self._columns[k]._symbol_set query = 'UPDATE "%s" SET "%s"=%s WHERE "%s" is NULL' % (self._table, k, ss[0], k) cr.execute(query, (ss[1](default),)) @@ -3176,7 +3176,7 @@ class BaseModel(object): # and add constraints if needed if isinstance(f, fields.many2one): if not self.pool.get(f._obj): - raise except_orm('Programming Error', ('There is no reference available for %s') % (f._obj,)) + raise except_orm('Programming Error', 'There is no reference available for %s' % (f._obj,)) dest_model = self.pool.get(f._obj) ref = dest_model._table # ir_actions is inherited so foreign key doesn't work on it @@ -3303,7 +3303,7 @@ class BaseModel(object): # TODO the condition could use fields_get_keys(). if f._fields_id not in other._columns.keys(): if f._fields_id not in other._inherit_fields.keys(): - raise except_orm('Programming Error', ("There is no reference field '%s' found for '%s'") % (f._fields_id, f._obj,)) + raise except_orm('Programming Error', "There is no reference field '%s' found for '%s'" % (f._fields_id, f._obj,)) def _m2m_raise_or_create_relation(self, cr, f): m2m_tbl, col1, col2 = f._sql_names(self) @@ -3311,7 +3311,7 @@ class BaseModel(object): cr.execute("SELECT relname FROM pg_class WHERE relkind IN ('r','v') AND relname=%s", (m2m_tbl,)) if not cr.dictfetchall(): if not self.pool.get(f._obj): - raise except_orm('Programming Error', ('Many2Many destination model does not exist: `%s`') % (f._obj,)) + raise except_orm('Programming Error', 'Many2Many destination model does not exist: `%s`' % (f._obj,)) dest_model = self.pool.get(f._obj) ref = dest_model._table cr.execute('CREATE TABLE "%s" ("%s" INTEGER NOT NULL, "%s" INTEGER NOT NULL, UNIQUE("%s","%s"))' % (m2m_tbl, col1, col2, col1, col2)) @@ -4672,7 +4672,7 @@ class BaseModel(object): new_tables = [] for table in added_tables: # table is just a table name -> switch to the full alias - if table == '"%s"' % (parent_table): + if table == '"%s"' % parent_table: new_tables.append('"%s" as "%s"' % (parent_table, parent_alias)) # table is already a full statement -> replace reference to the table to its alias, is correct with the way aliases are generated else: @@ -4997,7 +4997,7 @@ class BaseModel(object): """ if type(ids) in (int, long): ids = [ids] - query = 'SELECT id FROM "%s"' % (self._table) + query = 'SELECT id FROM "%s"' % self._table cr.execute(query + "WHERE ID IN %s", (tuple(ids),)) return [x[0] for x in cr.fetchall()] diff --git a/openerp/osv/query.py b/openerp/osv/query.py index 5cad7cf96f7..04a0ec5509b 100644 --- a/openerp/osv/query.py +++ b/openerp/osv/query.py @@ -151,7 +151,7 @@ class Query(object): query_from = add_joins_for_table(table_alias, query_from) query_from += ',' query_from = query_from[:-1] # drop last comma - return (query_from, " AND ".join(self.where_clause), self.where_clause_params) + return query_from, " AND ".join(self.where_clause), self.where_clause_params def __str__(self): return '' % self.get_sql() diff --git a/openerp/report/custom.py b/openerp/report/custom.py index 0ae560e1a22..c3d0ff810b7 100644 --- a/openerp/report/custom.py +++ b/openerp/report/custom.py @@ -273,7 +273,7 @@ class report_custom(report_int): res = self._create_bars(cr,uid, ids, report, fields, results2, context) elif report['type']=='line': res = self._create_lines(cr,uid, ids, report, fields, results2, context) - return (self.obj.get(), 'pdf') + return self.obj.get(), 'pdf' def _create_tree(self, uid, ids, report, fields, level, results, context): pageSize=common.pageSize.get(report['print_format'], [210.0,297.0]) diff --git a/openerp/report/int_to_text.py b/openerp/report/int_to_text.py index 52c456a1295..68906b98e72 100644 --- a/openerp/report/int_to_text.py +++ b/openerp/report/int_to_text.py @@ -52,7 +52,7 @@ def _1000_to_text(chiffre): d2 = chiffre/100 if d2>0 and d: return centaine[d2]+' '+d - elif d2>1 and not(d): + elif d2>1 and not d: return centaine[d2]+'s' else: return centaine[d2] or d diff --git a/openerp/report/interface.py b/openerp/report/interface.py index 32091b410e8..c0274e21c3f 100644 --- a/openerp/report/interface.py +++ b/openerp/report/interface.py @@ -85,7 +85,7 @@ class report_rml(report_int): xml = tools.ustr(xml).encode('utf8') report_type = datas.get('report_type', 'pdf') if report_type == 'raw': - return (xml,report_type) + return xml, report_type rml = self.create_rml(cr, xml, uid, context) pool = pooler.get_pool(cr.dbname) ir_actions_report_xml_obj = pool.get('ir.actions.report.xml') @@ -93,7 +93,7 @@ class report_rml(report_int): self.title = report_xml_ids and ir_actions_report_xml_obj.browse(cr,uid,report_xml_ids)[0].name or 'OpenERP Report' create_doc = self.generators[report_type] pdf = create_doc(rml, title=self.title) - return (pdf, report_type) + return pdf, report_type def create_xml(self, cr, uid, ids, datas, context=None): if not context: diff --git a/openerp/report/printscreen/ps_form.py b/openerp/report/printscreen/ps_form.py index c3735df2850..299e0466d8f 100644 --- a/openerp/report/printscreen/ps_form.py +++ b/openerp/report/printscreen/ps_form.py @@ -65,7 +65,7 @@ class report_printscreen_list(report_int): fields_order = self._parse_string(result['arch']) rows = model.read(cr, uid, datas['ids'], result['fields'].keys() ) self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model._description) - return (self.obj.get(), 'pdf') + return self.obj.get(), 'pdf' def _create_table(self, uid, ids, fields, fields_order, results, context, title=''): diff --git a/openerp/report/printscreen/ps_list.py b/openerp/report/printscreen/ps_list.py index 8908577e6ac..021994a732a 100644 --- a/openerp/report/printscreen/ps_list.py +++ b/openerp/report/printscreen/ps_list.py @@ -115,7 +115,7 @@ class report_printscreen_list(report_int): rows_new += [elem for elem in rows if elem['id'] == id] rows = rows_new res = self._create_table(uid, datas['ids'], result['fields'], fields_order, rows, context, model_desc) - return (self.obj.get(), 'pdf') + return self.obj.get(), 'pdf' def _create_table(self, uid, ids, fields, fields_order, results, context, title=''): diff --git a/openerp/report/pyPdf/pdf.py b/openerp/report/pyPdf/pdf.py index a3dd9f22962..5258e43e154 100644 --- a/openerp/report/pyPdf/pdf.py +++ b/openerp/report/pyPdf/pdf.py @@ -299,7 +299,7 @@ class PdfFileWriter(object): trailer.writeToStream(stream, None) # eof - stream.write("\nstartxref\n%s\n%%%%EOF\n" % (xref_location)) + stream.write("\nstartxref\n%s\n%%%%EOF\n" % xref_location) def _sweepIndirectReferences(self, externMap, data): if isinstance(data, DictionaryObject): diff --git a/openerp/report/render/rml2html/rml2html.py b/openerp/report/render/rml2html/rml2html.py index 90bd58af99a..0e82a5d3ea8 100644 --- a/openerp/report/render/rml2html/rml2html.py +++ b/openerp/report/render/rml2html/rml2html.py @@ -391,7 +391,7 @@ class _rml_doc(object): list_story.append(story_text) del f if template.data: - tag = ''''''%(template.data) + tag = ''''''% template.data else: tag = '' self.result +=''' diff --git a/openerp/report/render/rml2pdf/color.py b/openerp/report/render/rml2pdf/color.py index 35dd9637376..4d608c799d8 100644 --- a/openerp/report/render/rml2pdf/color.py +++ b/openerp/report/render/rml2pdf/color.py @@ -35,7 +35,7 @@ def get(col_str): return allcols[col_str] res = regex_t.search(col_str, 0) if res: - return (float(res.group(1)),float(res.group(2)),float(res.group(3))) + return float(res.group(1)), float(res.group(2)), float(res.group(3)) res = regex_h.search(col_str, 0) if res: return tuple([ float(int(res.group(i),16))/255 for i in range(1,4)]) diff --git a/openerp/report/render/rml2pdf/trml2pdf.py b/openerp/report/render/rml2pdf/trml2pdf.py index b8dc9885a4a..f9f060db1b9 100644 --- a/openerp/report/render/rml2pdf/trml2pdf.py +++ b/openerp/report/render/rml2pdf/trml2pdf.py @@ -123,7 +123,7 @@ class PageCount(platypus.Flowable): self.story_count = story_count def draw(self): - self.canv.beginForm("pageCount%d" % (self.story_count)) + self.canv.beginForm("pageCount%d" % self.story_count) self.canv.setFont("Helvetica", utils.unit_get(str(8))) self.canv.drawString(0, 0, str(self.canv.getPageNumber())) self.canv.endForm() @@ -268,18 +268,18 @@ class _rml_doc(object): if fontname not in pdfmetrics._fonts: pdfmetrics.registerFont(TTFont(fontname, filename)) - if (mode == 'all'): + if mode == 'all': addMapping(face, 0, 0, fontname) #normal addMapping(face, 0, 1, fontname) #italic addMapping(face, 1, 0, fontname) #bold addMapping(face, 1, 1, fontname) #italic and bold elif (mode== 'normal') or (mode == 'regular'): addMapping(face, 0, 0, fontname) #normal - elif (mode == 'italic'): + elif mode == 'italic': addMapping(face, 0, 1, fontname) #italic - elif (mode == 'bold'): + elif mode == 'bold': addMapping(face, 1, 0, fontname) #bold - elif (mode == 'bolditalic'): + elif mode == 'bolditalic': addMapping(face, 1, 1, fontname) #italic and bold def _textual_image(self, node): @@ -602,7 +602,7 @@ class _rml_Illustration(platypus.flowables.Flowable): self.height = utils.unit_get(node.get('height')) self.self2 = self2 def wrap(self, *args): - return (self.width, self.height) + return self.width, self.height def draw(self): drw = _rml_draw(self.localcontext ,self.node,self.styles, images=self.self2.images, path=self.self2.path, title=self.self2.title) drw.render(self.canv, None) diff --git a/openerp/report/render/rml2txt/rml2txt.py b/openerp/report/render/rml2txt/rml2txt.py index b431904f9c8..b0de2069c6e 100755 --- a/openerp/report/render/rml2txt/rml2txt.py +++ b/openerp/report/render/rml2txt/rml2txt.py @@ -107,11 +107,11 @@ class textbox(object): def haplines(self,arr,offset,cc= ''): """ Horizontaly append lines """ - while (len(self.lines) < len(arr)): + while len(self.lines) < len(arr): self.lines.append("") for i in range(len(self.lines)): - while (len(self.lines[i]) < offset): + while len(self.lines[i]) < offset: self.lines[i] += " " for i in range(len(arr)): self.lines[i] += cc +arr[i] diff --git a/openerp/report/report_sxw.py b/openerp/report/report_sxw.py index 27bd5fa5394..e0731b819f5 100644 --- a/openerp/report/report_sxw.py +++ b/openerp/report/report_sxw.py @@ -441,7 +441,7 @@ class report_sxw(report_rml, preprocess.report): raise NotImplementedError(_('Unknown report type: %s') % report_type) fnct_ret = fnct(cr, uid, ids, data, report_xml, context) if not fnct_ret: - return (False,False) + return False, False return fnct_ret def create_source_odt(self, cr, uid, ids, data, report_xml, context=None): @@ -531,7 +531,7 @@ class report_sxw(report_rml, preprocess.report): logo = base64.decodestring(rml_parser.logo) create_doc = self.generators[report_xml.report_type] pdf = create_doc(etree.tostring(processed_rml),rml_parser.localcontext,logo,title.encode('utf8')) - return (pdf, report_xml.report_type) + return pdf, report_xml.report_type def create_single_odt(self, cr, uid, ids, data, report_xml, context=None): if not context: @@ -644,7 +644,7 @@ class report_sxw(report_rml, preprocess.report): sxw_z.close() final_op = sxw_io.getvalue() sxw_io.close() - return (final_op, mime_type) + return final_op, mime_type def create_single_html2html(self, cr, uid, ids, data, report_xml, context=None): if not context: @@ -666,7 +666,7 @@ class report_sxw(report_rml, preprocess.report): create_doc = self.generators['html2html'] html = etree.tostring(create_doc(html_dom, html_parser.localcontext)) - return (html.replace('&','&').replace('<', '<').replace('>', '>').replace('
',''), report_type) + return html.replace('&','&').replace('<', '<').replace('>', '>').replace('
',''), report_type def create_single_mako2html(self, cr, uid, ids, data, report_xml, context=None): mako_html = report_xml.report_rml_content @@ -675,7 +675,7 @@ class report_sxw(report_rml, preprocess.report): html_parser.set_context(objs, data, ids, 'html') create_doc = self.generators['makohtml2html'] html = create_doc(mako_html,html_parser.localcontext) - return (html,'html') + return html,'html' # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 1496ea71646..6134f75f93e 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -139,7 +139,7 @@ class OpenERPAuthProvider(AuthProvider): uid = security.login(db,user,passwd) if uid is False: return False - return (user, passwd, db, uid) + return user, passwd, db, uid except Exception,e: _logger.debug("Fail auth: %s" % e ) return False diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index 5ce5b546dc7..d393dfa1003 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -172,13 +172,13 @@ class db(netsvc.ExportService): def exp_get_progress(self, id): if self.actions[id]['thread'].isAlive(): # return openerp.modules.init_progress[db_name] - return (min(self.actions[id].get('progress', 0),0.95), []) + return min(self.actions[id].get('progress', 0),0.95), [] else: clean = self.actions[id]['clean'] if clean: users = self.actions[id]['users'] self.actions.pop(id) - return (1.0, users) + return 1.0, users else: e = self.actions[id]['exception'] # TODO this seems wrong: actions[id]['traceback'] is set, but not 'exception'. self.actions.pop(id) @@ -543,7 +543,7 @@ GNU Public Licence. if os.name == 'posix': if platform.system() == 'Linux': lsbinfo = os.popen('lsb_release -a').read() - environment += '%s'%(lsbinfo) + environment += '%s'% lsbinfo else: environment += 'Your System is not lsb compliant\n' environment += 'Operating System Release : %s\n' \ diff --git a/openerp/sql_db.py b/openerp/sql_db.py index f18414bdff8..9848488660f 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -226,11 +226,11 @@ class Cursor(object): params = params or None res = self._obj.execute(query, params) except psycopg2.ProgrammingError, pe: - if (self._default_log_exceptions if log_exceptions is None else log_exceptions): + if self._default_log_exceptions if log_exceptions is None else log_exceptions: _logger.error("Programming error: %s, in query %s", pe, query) raise except Exception: - if (self._default_log_exceptions if log_exceptions is None else log_exceptions): + if self._default_log_exceptions if log_exceptions is None else log_exceptions: _logger.exception("bad query: %s", self._obj.query or query) raise diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 1ad5f2b4baa..9717792a82a 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -352,7 +352,7 @@ class configmanager(object): # Check if the config file exists (-c used, but not -s) die(not opt.save and opt.config and not os.path.exists(opt.config), "The config file '%s' selected with -c/--config doesn't exist, "\ - "use -s/--save if you want to generate it"%(opt.config)) + "use -s/--save if you want to generate it"% opt.config) # place/search the config file on Win32 near the server installation # (../etc from the server) diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py index 12ed269db8b..26561fc01f7 100644 --- a/openerp/tools/convert.py +++ b/openerp/tools/convert.py @@ -662,7 +662,7 @@ form: module.record_id""" % (xml_id,) if rec.get('action') and pid: action = "ir.actions.%s,%d" % (a_type, a_id) self.pool.get('ir.model.data').ir_set(cr, self.uid, 'action', 'tree_but_open', 'Menuitem', [('ir.ui.menu', int(pid))], action, True, True, xml_id=rec_id) - return ('ir.ui.menu', pid) + return 'ir.ui.menu', pid def _assert_equals(self, f1, f2, prec=4): return not round(f1 - f2, prec) diff --git a/openerp/tools/func.py b/openerp/tools/func.py index d1797e30b9a..4728d971c69 100644 --- a/openerp/tools/func.py +++ b/openerp/tools/func.py @@ -45,7 +45,7 @@ def frame_codeinfo(fframe, back=0): try: if not fframe: - return ("", '') + return "", '' for i in range(back): fframe = fframe.f_back try: @@ -53,8 +53,8 @@ def frame_codeinfo(fframe, back=0): except TypeError: fname = '' lineno = fframe.f_lineno or '' - return (fname, lineno) + return fname, lineno except Exception: - return ("", '') + return "", '' # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/tools/graph.py b/openerp/tools/graph.py index 1b039ce97c6..5eb69c793b0 100755 --- a/openerp/tools/graph.py +++ b/openerp/tools/graph.py @@ -70,7 +70,7 @@ class graph(object): for edge in list_edge: if ((self.reachable_nodes.__contains__(edge[0]) and edge[1] not in self.reachable_nodes) or (self.reachable_nodes.__contains__(edge[1]) and edge[0] not in self.reachable_nodes)): - if(slack>self.edge_wt[edge]-1): + if slack > self.edge_wt[edge]-1: slack = self.edge_wt[edge]-1 new_edge = edge @@ -243,7 +243,7 @@ class graph(object): if source_node in self.head_nodes: for dest_node in self.transitions[source_node]: if dest_node not in self.head_nodes: - if(slack>(self.edge_wt[edge]-1)): + if slack>(self.edge_wt[edge]-1): slack = self.edge_wt[edge]-1 new_edge = (source_node, dest_node) @@ -276,7 +276,7 @@ class graph(object): least_rank = min(map(lambda x: x['x'], self.result.values())) - if(least_rank!=0): + if least_rank!=0: for node in self.result: self.result[node]['x']-=least_rank @@ -377,7 +377,7 @@ class graph(object): if pre_level_nodes: for src in pre_level_nodes: - if (self.transitions.get(src) and self.transitions[src].__contains__(node)): + if self.transitions.get(src) and self.transitions[src].__contains__(node): adj_nodes.append(self.result[src]['y']) return adj_nodes @@ -455,7 +455,7 @@ class graph(object): mid_node = l[no/2] self.result[mid_node]['y'] = mid_pos - if self.transitions.get((mid_node), False): + if self.transitions.get(mid_node, False): if last: self.result[mid_node]['y'] = last + len(self.transitions[mid_node])/2 + 1 if node!=mid_node: @@ -494,7 +494,7 @@ class graph(object): if max_level%2: self.result[self.start]['y'] = (max_level+1)/2 + self.max_order + (self.max_order and 1) else: - self.result[self.start]['y'] = (max_level)/2 + self.max_order + (self.max_order and 1) + self.result[self.start]['y'] = max_level /2 + self.max_order + (self.max_order and 1) self.graph_order() @@ -716,7 +716,7 @@ class graph(object): #for flat edges ie. source an destination nodes are on the same rank for src in self.transitions: for des in self.transitions[src]: - if (self.result[des]['x'] - self.result[src]['x'] == 0): + if self.result[des]['x'] - self.result[src]['x'] == 0: self.result[src]['x'] += 0.08 self.result[des]['x'] -= 0.08 diff --git a/openerp/tools/misc.py b/openerp/tools/misc.py index 209e4aaebdf..1b84e3a5eb7 100644 --- a/openerp/tools/misc.py +++ b/openerp/tools/misc.py @@ -92,7 +92,7 @@ def exec_pg_command_pipe(name, *args): pop = subprocess.Popen((prog,) + args, bufsize= -1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=(os.name=="posix")) - return (pop.stdin, pop.stdout) + return pop.stdin, pop.stdout def exec_command_pipe(name, *args): prog = find_in_path(name) @@ -103,7 +103,7 @@ def exec_command_pipe(name, *args): pop = subprocess.Popen((prog,) + args, bufsize= -1, stdin=subprocess.PIPE, stdout=subprocess.PIPE, close_fds=(os.name=="posix")) - return (pop.stdin, pop.stdout) + return pop.stdin, pop.stdout #---------------------------------------------------------- # File paths @@ -181,7 +181,7 @@ def _fileopen(path, mode, basedir, pathinfo, basename=None): if os.path.isfile(name): fo = open(name, mode) if pathinfo: - return (fo, name) + return fo, name return fo # Support for loading modules in zipped form. @@ -208,7 +208,7 @@ def _fileopen(path, mode, basedir, pathinfo, basename=None): os.sep, '/'))) fo.seek(0) if pathinfo: - return (fo, name) + return fo, name return fo except Exception: pass @@ -725,7 +725,7 @@ def get_win32_timezone(): @return the standard name of the current win32 timezone, or False if it cannot be found. """ res = False - if (sys.platform == "win32"): + if sys.platform == "win32": try: import _winreg hklm = _winreg.ConnectRegistry(None,_winreg.HKEY_LOCAL_MACHINE) @@ -756,7 +756,7 @@ def detect_server_timezone(): (time.tzname[0], 'time.tzname'), (os.environ.get('TZ',False),'TZ environment variable'), ] # Option 4: OS-specific: /etc/timezone on Unix - if (os.path.exists("/etc/timezone")): + if os.path.exists("/etc/timezone"): tz_value = False try: f = open("/etc/timezone") @@ -767,7 +767,7 @@ def detect_server_timezone(): f.close() sources.append((tz_value,"/etc/timezone file")) # Option 5: timezone info from registry on Win32 - if (sys.platform == "win32"): + if sys.platform == "win32": # Timezone info is stored in windows registry. # However this is not likely to work very well as the standard name # of timezones in windows is rarely something that is known to pytz. diff --git a/openerp/tools/translate.py b/openerp/tools/translate.py index 4fc832289d2..35f54a5151e 100644 --- a/openerp/tools/translate.py +++ b/openerp/tools/translate.py @@ -288,7 +288,7 @@ class TinyPoFile(object): return lines def cur_line(self): - return (self.lines_count - len(self.lines)) + return self.lines_count - len(self.lines) def next(self): trans_type = name = res_id = source = trad = None @@ -301,7 +301,7 @@ class TinyPoFile(object): targets = [] line = None fuzzy = False - while (not line): + while not line: if 0 == len(self.lines): raise StopIteration() line = self.lines.pop(0).strip() @@ -861,7 +861,7 @@ def trans_generate(lang, modules, cr): frelativepath = fabsolutepath[len(path):] display_path = "addons%s" % frelativepath module = get_module_from_path(fabsolutepath, mod_paths=mod_paths) - if (('all' in modules) or (module in modules)) and module in installed_modules: + if ('all' in modules or module in modules) and module in installed_modules: return module, fabsolutepath, frelativepath, display_path return None, None, None, None diff --git a/openerp/workflow/workitem.py b/openerp/workflow/workitem.py index ac783b76a30..60c03ea9da5 100644 --- a/openerp/workflow/workitem.py +++ b/openerp/workflow/workitem.py @@ -126,7 +126,7 @@ def _execute(cr, workitem, activity, ident, stack): _state_set(cr, workitem, activity, 'running', ident) if activity.get('action', False): id_new = wkf_expr.execute(cr, ident, workitem, activity) - if not (id_new): + if not id_new: cr.execute('delete from wkf_workitem where id=%s', (workitem['id'],)) return False assert type(id_new)==type(1) or type(id_new)==type(1L), 'Wrong return value: '+str(id_new)+' '+str(type(id_new))