From fb3638a6f2b5ea01e4ee019debb9a7fb5bbe7774 Mon Sep 17 00:00:00 2001 From: Bertrand Chenal Date: Mon, 28 Jan 2008 23:34:32 +0100 Subject: [PATCH] Guidelines --- trytond/ir/model.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/trytond/ir/model.py b/trytond/ir/model.py index f19fc73b22..1db46f3c9b 100644 --- a/trytond/ir/model.py +++ b/trytond/ir/model.py @@ -210,11 +210,11 @@ class ModelData(OSV): if (fs_id, module) in self.fs2db[cursor.dbname]: return self.fs2db[cursor.dbname][(fs_id, module)][0] else: - raise Exception("Reference to %s not found"% ".".join([module,fs_id])) + raise Exception("Reference to %s not found"%\ + ".".join([module,fs_id])) - - def _clean_value(self, key, browse_record, object_ref): - # XXX self is no use, move this outside the class ? + @staticmethod + def _clean_value(key, browse_record, object_ref): """ Take a field name, a browse_record, and a reference to the corresponding object. Return a raw value has it must look on the @@ -273,7 +273,7 @@ class ModelData(OSV): for key in values: try: - db_field = self._clean_value(key, db_values, object_ref) + db_field = ModelData._clean_value(key, db_values, object_ref) except Unhandled_field: logger = Logger() logger.notify_channel('init', LOG_WARNING, @@ -296,11 +296,13 @@ class ModelData(OSV): (key, db_id, model, fs_id)) continue - elif (old_values[key] and db_field) and old_values[key] != db_field: + elif (old_values[key] and db_field) and \ + old_values[key] != db_field: logger = Logger() logger.notify_channel('init', LOG_WARNING, "Field %s of %s@%s not updated (id: %s), because "\ - "it has changed since the last update."% (key, db_id, model, fs_id)) + "it has changed since the last update."%\ + (key, db_id, model, fs_id)) continue # so, the field in the fs and in the db are different, @@ -316,7 +318,8 @@ class ModelData(OSV): db_val = object_ref.browse(cursor, user, db_id) for key in to_update: try: - values[key] = self._clean_value(key, db_val, object_ref) + values[key] = ModelData._clean_value( + key, db_val, object_ref) except Unhandled_field: continue @@ -341,7 +344,7 @@ class ModelData(OSV): db_val = object_ref.browse(cursor, user, db_id) for key in values: try: - values[key] = self._clean_value(key, db_val, object_ref) + values[key] = ModelData._clean_value(key, db_val, object_ref) except Unhandled_field: continue