From 40c1de87d821dea9933d920aac13cab1f149f9d9 Mon Sep 17 00:00:00 2001 From: Florent Xicluna Date: Sun, 15 Jan 2012 22:42:14 +0100 Subject: [PATCH] [REF] remove unused import, always import literal_eval from tools.safe_eval. bzr revid: florent.xicluna@gmail.com-20120115214214-0rjwn80choc9g0fs --- openerp/addons/base/ir/ir_actions.py | 5 ++--- openerp/netsvc.py | 1 - openerp/service/http_server.py | 14 +++++--------- openerp/service/web_services.py | 1 + openerp/service/websrv_lib.py | 3 --- openerp/sql_db.py | 5 ++--- openerp/tests/common.py | 1 - openerp/tests/test_ir_sequence.py | 3 --- openerp/tests/test_xmlrpc.py | 1 - 9 files changed, 10 insertions(+), 24 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index f02269fa9bc..96b6bae848f 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -18,7 +18,6 @@ # along with this program. If not, see . # ############################################################################## -import ast import copy import logging import os @@ -31,7 +30,7 @@ import netsvc from osv import fields,osv from report.report_sxw import report_sxw, report_rml from tools.config import config -from tools.safe_eval import safe_eval as eval +from tools.safe_eval import safe_eval as eval, literal_eval from tools.translate import _ from socket import gethostname @@ -920,7 +919,7 @@ class act_client(osv.osv): def _get_params(self, cr, uid, ids, field_name, arg, context): return dict([ - ((record.id, ast.literal_eval(record.params_store)) + ((record.id, literal_eval(record.params_store)) if record.params_store else (record.id, False)) for record in self.browse(cr, uid, ids, context=context) ]) diff --git a/openerp/netsvc.py b/openerp/netsvc.py index c1120763ad4..ca08a362771 100644 --- a/openerp/netsvc.py +++ b/openerp/netsvc.py @@ -30,7 +30,6 @@ import socket import sys import threading import time -import traceback import types from pprint import pformat diff --git a/openerp/service/http_server.py b/openerp/service/http_server.py index 506138b7fb4..66d701e0681 100644 --- a/openerp/service/http_server.py +++ b/openerp/service/http_server.py @@ -39,21 +39,17 @@ static HTTP, DAV or other. """ -from websrv_lib import * -import openerp.netsvc as netsvc -import errno -import threading -import openerp.tools as tools +import base64 import posixpath import urllib import os -import select -import socket -import xmlrpclib import logging - from SimpleXMLRPCServer import SimpleXMLRPCDispatcher +from websrv_lib import * +import openerp.netsvc as netsvc +import openerp.tools as tools + try: import fcntl except ImportError: diff --git a/openerp/service/web_services.py b/openerp/service/web_services.py index f486a050a7f..3fa65d8c9ce 100644 --- a/openerp/service/web_services.py +++ b/openerp/service/web_services.py @@ -39,6 +39,7 @@ import openerp.sql_db as sql_db import openerp.tools as tools import openerp.modules import openerp.exceptions +from openerp.service import http_server #.apidoc title: Exported Service methods #.apidoc module-mods: member-order: bysource diff --git a/openerp/service/websrv_lib.py b/openerp/service/websrv_lib.py index a4bdebcec27..1e276ab7fa2 100644 --- a/openerp/service/websrv_lib.py +++ b/openerp/service/websrv_lib.py @@ -32,9 +32,6 @@ usable in other projects, too. """ -import socket -import base64 -import errno import SocketServer from BaseHTTPServer import * from SimpleHTTPServer import SimpleHTTPRequestHandler diff --git a/openerp/sql_db.py b/openerp/sql_db.py index 63ab2a13fb9..82851abd034 100644 --- a/openerp/sql_db.py +++ b/openerp/sql_db.py @@ -37,8 +37,7 @@ __all__ = ['db_connect', 'close_db'] from threading import currentThread import logging -from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_SERIALIZABLE,\ - ISOLATION_LEVEL_REPEATABLE_READ +from psycopg2.extensions import ISOLATION_LEVEL_AUTOCOMMIT, ISOLATION_LEVEL_READ_COMMITTED, ISOLATION_LEVEL_REPEATABLE_READ from psycopg2.psycopg1 import cursor as psycopg1cursor from psycopg2.pool import PoolError @@ -421,7 +420,7 @@ class ConnectionPool(object): try: result = psycopg2.connect(dsn=dsn, connection_factory=PsycoConnection) - except psycopg2.Error, e: + except psycopg2.Error: self.__logger.exception('Connection to the database failed') raise self._connections.append((result, True)) diff --git a/openerp/tests/common.py b/openerp/tests/common.py index 57ebead925e..44696384ce7 100644 --- a/openerp/tests/common.py +++ b/openerp/tests/common.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- import os import time -import unittest2 import xmlrpclib import openerp diff --git a/openerp/tests/test_ir_sequence.py b/openerp/tests/test_ir_sequence.py index c926a52ed64..2e9623c09b9 100644 --- a/openerp/tests/test_ir_sequence.py +++ b/openerp/tests/test_ir_sequence.py @@ -7,11 +7,8 @@ # > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \ # OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_ir_sequence # This assume an existing database. -import os import psycopg2 -import time import unittest2 -import xmlrpclib import openerp import common diff --git a/openerp/tests/test_xmlrpc.py b/openerp/tests/test_xmlrpc.py index 65d40af866a..954d3447360 100644 --- a/openerp/tests/test_xmlrpc.py +++ b/openerp/tests/test_xmlrpc.py @@ -6,7 +6,6 @@ # OPENERP_DATABASE=yy nosetests tests/test_xmlrpc.py # > OPENERP_ADDONS_PATH='../../../addons/trunk' OPENERP_PORT=8069 \ # OPENERP_DATABASE=yy PYTHONPATH=../:. unit2 test_xmlrpc -import os import time import unittest2 import xmlrpclib