From 301497c5432ecba27e4c7615beeaffea3b549b7c Mon Sep 17 00:00:00 2001
From: Olivier Dony <odo@openerp.com>
Date: Fri, 24 Jun 2011 15:33:35 +0200
Subject: [PATCH] [IMP] lint cleanup

bzr revid: odo@openerp.com-20110624133335-jf5kg6dh9kgxw2dg
---
 openerp/addons/base/ir/ir_model.py   | 1 -
 openerp/addons/base/ir/ir_ui_view.py | 1 -
 openerp/netsvc.py                    | 2 --
 openerp/osv/orm.py                   | 2 +-
 openerp/tools/convert.py             | 1 -
 openerp/tools/yaml_import.py         | 3 +--
 6 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py
index 4b482085ad6..d3dfd987638 100644
--- a/openerp/addons/base/ir/ir_model.py
+++ b/openerp/addons/base/ir/ir_model.py
@@ -21,7 +21,6 @@
 import logging
 import re
 import time
-from operator import itemgetter
 
 from osv import fields,osv
 import netsvc
diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py
index ebbfe7cea38..ee23a2f52f1 100644
--- a/openerp/addons/base/ir/ir_ui_view.py
+++ b/openerp/addons/base/ir/ir_ui_view.py
@@ -24,7 +24,6 @@ from lxml import etree
 from tools import graph
 from tools.safe_eval import safe_eval as eval
 import tools
-import netsvc
 import os
 import logging
 
diff --git a/openerp/netsvc.py b/openerp/netsvc.py
index aca1b9c12a9..1d9e0a5fcc0 100644
--- a/openerp/netsvc.py
+++ b/openerp/netsvc.py
@@ -35,7 +35,6 @@ import socket
 import sys
 import threading
 import time
-import warnings
 import types
 from pprint import pformat
 
@@ -186,7 +185,6 @@ class ColoredFormatter(DBFormatter):
         return DBFormatter.format(self, record)
 
 def init_logger():
-    import os
     from tools.translate import resetlocale
     resetlocale()
 
diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index be7045e2f11..a817f73310d 100644
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -972,7 +972,7 @@ class orm_template(object):
                 if field[len(prefix)]=='id':
                     try:
                         data_res_id = _get_id(model_name, line[i], current_module, 'id')
-                    except ValueError, e:
+                    except ValueError:
                         pass
                     xml_id = line[i]
                     continue
diff --git a/openerp/tools/convert.py b/openerp/tools/convert.py
index 79906a008d2..77abfa572b4 100644
--- a/openerp/tools/convert.py
+++ b/openerp/tools/convert.py
@@ -45,7 +45,6 @@ import openerp.loglevels as loglevels
 import openerp.pooler as pooler
 from config import config
 from translate import _
-from yaml_import import convert_yaml_import
 
 # List of etree._Element subclasses that we choose to ignore when parsing XML.
 from misc import SKIPPED_ELEMENT_TYPES
diff --git a/openerp/tools/yaml_import.py b/openerp/tools/yaml_import.py
index 1c6a54c63b0..00bb79f0499 100644
--- a/openerp/tools/yaml_import.py
+++ b/openerp/tools/yaml_import.py
@@ -177,7 +177,7 @@ class YamlInterpreter(object):
             try:
                 _, id = self.pool.get('ir.model.data').get_object_reference(self.cr, self.uid, module, checked_xml_id)
                 self.id_map[xml_id] = id
-            except ValueError, e:
+            except ValueError:
                 raise ValueError("""%s not found when processing %s.
     This Yaml file appears to depend on missing data. This often happens for
     tests that belong to a module's test suite and depend on each other.""" % (checked_xml_id, self.filename))
@@ -488,7 +488,6 @@ class YamlInterpreter(object):
         if self.isnoupdate(function) and self.mode != 'init':
             return
         model = self.get_model(function.model)
-        context = self.get_context(function, self.eval_context)
         if function.eval:
             args = self.process_eval(function.eval)
         else: