From 90a9ec098c35d1a3f5eaf38d06c95e29fc0ca9c6 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 2 Sep 2011 08:30:06 +0200
Subject: [PATCH] [FIX] imports in base.common: remove star-import, remove
 unused imports

bzr revid: xmo@openerp.com-20110902063006-9eyeucl7r8p8j6ay
---
 addons/base/common/backendrpc.py  | 13 -------------
 addons/base/common/dispatch.py    | 14 ++++----------
 addons/base/common/nonliterals.py |  2 --
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/addons/base/common/backendrpc.py b/addons/base/common/backendrpc.py
index d2e2f6615e1..e6c59000caf 100644
--- a/addons/base/common/backendrpc.py
+++ b/addons/base/common/backendrpc.py
@@ -1,22 +1,9 @@
 #!/usr/bin/python
 import datetime
-import urllib
 import dateutil.relativedelta
-import functools
-import logging
-import optparse
-import os
-import sys
-import tempfile
 import time
-import traceback
-import uuid
 import xmlrpclib
 
-import cherrypy
-import cherrypy.lib.static
-import simplejson
-
 import nonliterals
 #----------------------------------------------------------
 # OpenERPSession RPC openerp backend access
diff --git a/addons/base/common/dispatch.py b/addons/base/common/dispatch.py
index bddcffb8ce9..2f2d7c729b9 100644
--- a/addons/base/common/dispatch.py
+++ b/addons/base/common/dispatch.py
@@ -1,14 +1,9 @@
 #!/usr/bin/python
-import datetime
 import urllib
-import dateutil.relativedelta
 import functools
 import logging
-import optparse
 import os
 import sys
-import tempfile
-import time
 import traceback
 import uuid
 import xmlrpclib
@@ -18,9 +13,8 @@ import cherrypy.lib.static
 import simplejson
 
 import nonliterals
-# TODO if from openerpserver use backendlocal
-# from backendlocal import *
-from backendrpc import *
+# import backendlocal as backend
+import backendrpc as backend
 
 #-----------------------------------------------------------
 # Globals
@@ -61,7 +55,7 @@ class CherryPyRequest(object):
         self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
         host = cherrypy.config['openerp.server.host']
         port = cherrypy.config['openerp.server.port']
-        self.session = self.httpsession.setdefault(self.session_id, OpenERPSession(host, port))
+        self.session = self.httpsession.setdefault(self.session_id, backend.OpenERPSession(host, port))
         # Request attributes
         self.context = self.params.pop('context', None)
         self.debug = self.params.pop('debug',False) != False
@@ -123,7 +117,7 @@ class JsonRequest(CherryPyRequest):
                 print "--> %s.%s %s" % (controller.__class__.__name__, method.__name__, self.jsonrequest)
             response['id'] = self.jsonrequest.get('id')
             response["result"] = method(controller, self, **self.params)
-        except OpenERPUnboundException:
+        except backend.OpenERPUnboundException:
             error = {
                 'code': 100,
                 'message': "OpenERP Session Invalid",
diff --git a/addons/base/common/nonliterals.py b/addons/base/common/nonliterals.py
index 5b61f39fc83..937da06ad9e 100644
--- a/addons/base/common/nonliterals.py
+++ b/addons/base/common/nonliterals.py
@@ -7,8 +7,6 @@ can't be sent there themselves).
 import binascii
 import hashlib
 import simplejson.encoder
-import time
-import datetime
 
 __all__ = ['Domain', 'Context', 'NonLiteralEncoder, non_literal_decoder', 'CompoundDomain', 'CompoundContext']