From 0a471486e038ba75fcdf6f9de2e2ef65821ab90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20=C3=89vrard?= Date: Wed, 2 Nov 2011 15:49:38 +0100 Subject: [PATCH] correct pyflake errors review164003 --- doc/conf.py | 4 ++-- setup.py | 1 - trytond/backend/mysql/database.py | 1 - trytond/backend/postgresql/database.py | 1 - trytond/backend/sqlite/database.py | 1 - trytond/ir/action.py | 1 - trytond/ir/cron.py | 5 ++--- trytond/ir/lang.py | 4 ---- trytond/ir/module/module.py | 9 +-------- trytond/ir/property.py | 5 ----- trytond/ir/sequence.py | 2 -- trytond/ir/translation.py | 3 --- trytond/ir/trigger.py | 2 -- trytond/ir/ui/view.py | 4 +--- trytond/model/fields/function.py | 3 --- trytond/model/fields/one2one.py | 1 - trytond/model/modelsql.py | 3 +-- trytond/modules/__init__.py | 5 +---- trytond/protocols/common.py | 1 - trytond/protocols/jsonrpc.py | 1 - trytond/protocols/webdav.py | 1 - trytond/protocols/xmlrpc.py | 1 - trytond/pyson.py | 1 - trytond/report/report.py | 3 --- trytond/res/request.py | 1 - trytond/security.py | 1 - trytond/tests/test_access.py | 4 ++-- trytond/tests/test_exportdata.py | 4 ++-- trytond/tests/test_sequence.py | 3 +-- trytond/tests/test_tools.py | 5 ----- trytond/tests/test_trigger.py | 1 - trytond/tests/test_tryton.py | 3 +-- trytond/tools/misc.py | 7 ------- trytond/webdav/webdav.py | 1 - trytond/workflow/workflow.py | 2 -- 35 files changed, 14 insertions(+), 81 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 01175133be..809904eb01 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -12,8 +12,8 @@ # # All configuration values have a default; values that are commented out # serve to show the default. - -import sys, os +# +# import sys, os # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the diff --git a/setup.py b/setup.py index a84f1403ad..6046e70bfe 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,6 @@ from setuptools import setup, find_packages import os -import sys execfile(os.path.join('trytond', 'version.py')) diff --git a/trytond/backend/mysql/database.py b/trytond/backend/mysql/database.py index 31b9f79117..3c0ee09851 100644 --- a/trytond/backend/mysql/database.py +++ b/trytond/backend/mysql/database.py @@ -170,7 +170,6 @@ class Database(DatabaseInterface): for i in ('ir', 'workflow', 'res', 'webdav'): root_path = os.path.join(os.path.dirname(__file__), '..', '..') tryton_file = os.path.join(root_path, i, '__tryton__.py') - mod_path = os.path.join(root_path, i) with open(tryton_file) as fp: info = safe_eval(fp.read()) active = info.get('active', False) diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py index 19d156e53c..3950a84bb6 100644 --- a/trytond/backend/postgresql/database.py +++ b/trytond/backend/postgresql/database.py @@ -235,7 +235,6 @@ class Database(DatabaseInterface): for i in ('ir', 'workflow', 'res', 'webdav'): root_path = os.path.join(os.path.dirname(__file__), '..', '..') tryton_file = os.path.join(root_path, i, '__tryton__.py') - mod_path = os.path.join(root_path, i) with open(tryton_file) as fp: info = safe_eval(fp.read()) active = info.get('active', False) diff --git a/trytond/backend/sqlite/database.py b/trytond/backend/sqlite/database.py index d01d7dd961..1e78b75e2d 100644 --- a/trytond/backend/sqlite/database.py +++ b/trytond/backend/sqlite/database.py @@ -220,7 +220,6 @@ class Database(DatabaseInterface): for i in ('ir', 'workflow', 'res', 'webdav'): root_path = os.path.join(os.path.dirname(__file__), '..', '..') tryton_file = os.path.join(root_path, i, '__tryton__.py') - mod_path = os.path.join(root_path, i) with open(tryton_file) as fp: info = safe_eval(fp.read()) active = info.get('active', False) diff --git a/trytond/ir/action.py b/trytond/ir/action.py index 6d9affa5d9..3fb2a681f2 100644 --- a/trytond/ir/action.py +++ b/trytond/ir/action.py @@ -7,7 +7,6 @@ from trytond.tools import file_open, safe_eval from trytond.backend import TableHandler from trytond.pyson import PYSONEncoder, CONTEXT, PYSON from trytond.transaction import Transaction -from trytond.cache import Cache from trytond.pool import Pool from trytond.exceptions import UserError diff --git a/trytond/ir/cron.py b/trytond/ir/cron.py index 99ed8d329b..b48125adf4 100644 --- a/trytond/ir/cron.py +++ b/trytond/ir/cron.py @@ -6,7 +6,6 @@ from dateutil.relativedelta import relativedelta import traceback import sys import logging -from trytond.backend import Database from trytond.model import ModelView, ModelSQL, fields from trytond.tools import safe_eval from trytond.transaction import Transaction @@ -136,7 +135,7 @@ class Cron(ModelSQL, ModelView): model_obj = pool.get(cron.model) with Transaction().set_user(cron.user.id): getattr(model_obj, cron.function)(*args) - except Exception, error: + except Exception: Transaction().cursor.rollback() request_obj = pool.get('res.request') @@ -146,7 +145,7 @@ class Cron(ModelSQL, ModelView): with contextlib.nested(Transaction().set_user(cron.user.id), Transaction().set_context(language=language)): values = self._get_request_values(cron) - rid = request_obj.create(values) + request_obj.create(values) Transaction().cursor.commit() def run(self, db_name): diff --git a/trytond/ir/lang.py b/trytond/ir/lang.py index 70901bd222..5e31715439 100644 --- a/trytond/ir/lang.py +++ b/trytond/ir/lang.py @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import time import datetime import warnings @@ -203,9 +202,6 @@ class Lang(ModelSQL, ModelView, Cacheable): grouping = safe_eval(lang['grouping']) if not grouping: return (s, 0) - result = "" - seps = 0 - spaces = "" if s[-1] == ' ': stripped = s.rstrip() right_spaces = s[len(stripped):] diff --git a/trytond/ir/module/module.py b/trytond/ir/module/module.py index 59a9967efb..987e86798e 100644 --- a/trytond/ir/module/module.py +++ b/trytond/ir/module/module.py @@ -3,9 +3,8 @@ import os from trytond.model import ModelView, ModelSQL, fields import trytond.tools as tools -from trytond.modules import MODULES_PATH, create_graph, get_module_list +from trytond.modules import create_graph, get_module_list from trytond.wizard import Wizard -from trytond.backend import Database from trytond.pool import Pool from trytond.transaction import Transaction @@ -281,12 +280,6 @@ class Module(ModelSQL, ModelView): self._update_dependencies(mod, tryton.get('depends', [])) continue - if name in ['ir', 'workflow', 'res', 'webdav']: - mod_path = os.path.join( - os.path.dirname(MODULES_PATH), name) - else: - mod_path = os.path.join(MODULES_PATH, name) - tryton = Module.get_module_info(mod_name) if not tryton: continue diff --git a/trytond/ir/property.py b/trytond/ir/property.py index 73a175ca53..db5148027a 100644 --- a/trytond/ir/property.py +++ b/trytond/ir/property.py @@ -45,11 +45,6 @@ class Property(ModelSQL, ModelView): if res_ids is None: res_ids = [] - model_obj = pool.get(model) - fields = dict((name, field) - for name, field in model_obj._columns.iteritems() - if name in names) - property_ids = self.search([ ('field.name', 'in', names), ['OR', diff --git a/trytond/ir/sequence.py b/trytond/ir/sequence.py index 170eebe474..6cc737e69d 100644 --- a/trytond/ir/sequence.py +++ b/trytond/ir/sequence.py @@ -1,7 +1,6 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. from string import Template -import datetime import time from trytond.model import ModelView, ModelSQL, fields from trytond.tools import datetime_strftime @@ -148,7 +147,6 @@ class Sequence(ModelSQL, ModelView): return result def set_number_next(self, ids, name, value): - cursor = Transaction().cursor super(Sequence, self).write(ids, { 'number_next_internal': value, }) diff --git a/trytond/ir/translation.py b/trytond/ir/translation.py index 49e98b2fb7..68ec058457 100644 --- a/trytond/ir/translation.py +++ b/trytond/ir/translation.py @@ -7,9 +7,7 @@ except ImportError: import StringIO import zipfile import polib -import operator from xml import dom -from xml.dom import minidom from difflib import SequenceMatcher import os try: @@ -20,7 +18,6 @@ from functools import reduce from trytond.model import ModelView, ModelSQL, fields from trytond.model.cacheable import Cacheable from trytond.wizard import Wizard -from trytond import tools from trytond.tools import file_open, reduce_ids from trytond.backend import TableHandler, FIELDS from trytond.pyson import PYSONEncoder diff --git a/trytond/ir/trigger.py b/trytond/ir/trigger.py index f7e00b799c..c81633bb30 100644 --- a/trytond/ir/trigger.py +++ b/trytond/ir/trigger.py @@ -137,8 +137,6 @@ class Trigger(ModelSQL, ModelView): :param record: a BrowseRecord of the tested model :return: a boolean """ - pool = Pool() - model_obj = pool.get(trigger.model.model) env = {} env['current_date'] = datetime.datetime.today() env['time'] = time diff --git a/trytond/ir/ui/view.py b/trytond/ir/ui/view.py index 72a7422d45..35353933b6 100644 --- a/trytond/ir/ui/view.py +++ b/trytond/ir/ui/view.py @@ -6,7 +6,7 @@ from lxml import etree from difflib import SequenceMatcher from trytond.model import ModelView, ModelSQL, fields from trytond.backend import TableHandler -from trytond.pyson import PYSONEncoder, CONTEXT, Eval +from trytond.pyson import CONTEXT, Eval from trytond.tools import safe_eval from trytond.transaction import Transaction from trytond.wizard import Wizard @@ -267,10 +267,8 @@ class ShowView(Wizard): view_obj = pool.get('ir.ui.view') result = super(ShowView, self).execute(wiz_id, data, state=state) view = view_obj.browse(data['id']) - view_id = view.id view_type = view.type if view.inherit: - view_id = view.inherit.id view_type = view.inherit.type if view_type != 'form': self.raise_user_error('view_type') diff --git a/trytond/model/fields/function.py b/trytond/model/fields/function.py index edc639be25..d1b50e3aff 100644 --- a/trytond/model/fields/function.py +++ b/trytond/model/fields/function.py @@ -4,9 +4,6 @@ import inspect import copy from trytond.model.fields.field import Field -from trytond.model.fields.float import digits_validate -from trytond.model.fields.one2many import add_remove_validate -from trytond.pyson import PYSON class Function(Field): diff --git a/trytond/model/fields/one2one.py b/trytond/model/fields/one2one.py index 6e0133fb7d..b712a8d9e4 100644 --- a/trytond/model/fields/one2one.py +++ b/trytond/model/fields/one2one.py @@ -2,7 +2,6 @@ #this repository contains the full copyright notices and license terms. from trytond.model.fields.many2many import Many2Many -from trytond.transaction import Transaction from trytond.pool import Pool diff --git a/trytond/model/modelsql.py b/trytond/model/modelsql.py index 8baafd9019..2429cb6b36 100644 --- a/trytond/model/modelsql.py +++ b/trytond/model/modelsql.py @@ -9,7 +9,7 @@ from itertools import islice from trytond.model import ModelStorage from trytond.model import fields from trytond.backend import FIELDS, TableHandler -from trytond.backend import DatabaseIntegrityError, Database +from trytond.backend import DatabaseIntegrityError from trytond.tools import reduce_ids from trytond.const import OPERATORS, RECORD_CACHE_SIZE from trytond.transaction import Transaction @@ -1306,7 +1306,6 @@ class ModelSQL(ModelStorage): return qu1, qu2, tables, tables_args def __search_domain_oper(self, domain, tables, tables_args): - pool = Pool() operator = 'AND' if len(domain) and isinstance(domain[0], basestring): if domain[0] not in ('AND', 'OR'): diff --git a/trytond/modules/__init__.py b/trytond/modules/__init__.py index a00a63b781..4c46dfed4d 100644 --- a/trytond/modules/__init__.py +++ b/trytond/modules/__init__.py @@ -1,14 +1,12 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import os, sys, imp +import os, sys import itertools -import traceback import logging import contextlib from functools import reduce import imp import operator -from trytond.backend import Database import trytond.tools as tools from trytond.config import CONFIG from trytond.transaction import Transaction @@ -216,7 +214,6 @@ def load_module_graph(graph, pool, lang=None): sys.stdout.flush() objects = pool.instanciate(module) package_state = module2state.get(module, 'uninstalled') - idref = {} if hasattr(package, 'init') \ or hasattr(package, 'update') \ or (package_state in ('to install', 'to upgrade')): diff --git a/trytond/protocols/common.py b/trytond/protocols/common.py index 1b972b2135..8afc80fe8f 100644 --- a/trytond/protocols/common.py +++ b/trytond/protocols/common.py @@ -4,7 +4,6 @@ import errno import os import socket import threading -import select import sys import gzip try: diff --git a/trytond/protocols/jsonrpc.py b/trytond/protocols/jsonrpc.py index 6151336489..3516d227da 100644 --- a/trytond/protocols/jsonrpc.py +++ b/trytond/protocols/jsonrpc.py @@ -3,7 +3,6 @@ from trytond.protocols.sslsocket import SSLSocket from trytond.protocols.dispatcher import dispatch from trytond.config import CONFIG -from trytond.protocols.datatype import Float from trytond.protocols.common import daemon, GZipRequestHandlerMixin from trytond.exceptions import UserError, UserWarning, NotLogged, \ ConcurrencyException diff --git a/trytond/protocols/webdav.py b/trytond/protocols/webdav.py index 49468d68a7..b8024fbb3f 100644 --- a/trytond/protocols/webdav.py +++ b/trytond/protocols/webdav.py @@ -2,7 +2,6 @@ #this repository contains the full copyright notices and license terms. import SocketServer import socket -import os import BaseHTTPServer import urlparse import time diff --git a/trytond/protocols/xmlrpc.py b/trytond/protocols/xmlrpc.py index 91af6e282a..8847cfeaa5 100644 --- a/trytond/protocols/xmlrpc.py +++ b/trytond/protocols/xmlrpc.py @@ -14,7 +14,6 @@ import xmlrpclib import traceback import socket import sys -import os import base64 import datetime from types import DictType diff --git a/trytond/pyson.py b/trytond/pyson.py index 9c7dde7e93..2d615895d7 100644 --- a/trytond/pyson.py +++ b/trytond/pyson.py @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import sys try: import simplejson as json except ImportError: diff --git a/trytond/report/report.py b/trytond/report/report.py index be9b14e8c4..13ce00a740 100644 --- a/trytond/report/report.py +++ b/trytond/report/report.py @@ -1,8 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import copy -import xml -import sys try: import cStringIO as StringIO except ImportError: diff --git a/trytond/res/request.py b/trytond/res/request.py index 5be47f01c8..03841adc89 100644 --- a/trytond/res/request.py +++ b/trytond/res/request.py @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import time import datetime from trytond.model import ModelView, ModelSQL, fields from trytond.pyson import Eval, If diff --git a/trytond/security.py b/trytond/security.py index de0edca154..4f2460d662 100644 --- a/trytond/security.py +++ b/trytond/security.py @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -from trytond.backend import Database from trytond.session import Session from trytond.pool import Pool from trytond.config import CONFIG diff --git a/trytond/tests/test_access.py b/trytond/tests/test_access.py index 3d9c7d0282..d7905ed501 100644 --- a/trytond/tests/test_access.py +++ b/trytond/tests/test_access.py @@ -196,7 +196,7 @@ class ModelAccessTestCase(unittest.TestCase): model_id, = self.model.search([('model', '=', 'test.access')]) # Without model access - test_id = self.test_access.create({}) + self.test_access.create({}) # With model access @@ -277,7 +277,7 @@ class ModelAccessTestCase(unittest.TestCase): test_ids = [self.test_access.create({}) for x in range(11)] # Without model access - test_id = self.test_access.delete(test_ids.pop()) + self.test_access.delete(test_ids.pop()) # With model access diff --git a/trytond/tests/test_exportdata.py b/trytond/tests/test_exportdata.py index 04524309b4..2479240aad 100644 --- a/trytond/tests/test_exportdata.py +++ b/trytond/tests/test_exportdata.py @@ -300,14 +300,14 @@ class ExportDataTestCase(unittest.TestCase): ''' with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: export1_id = self.export_data.create({}) - target1_id = self.export_data_target.create({ + self.export_data_target.create({ 'name': 'Target 1', 'one2many': export1_id, }) self.assert_(self.export_data.export_data([export1_id], ['one2many/name']) == [['Target 1']]) - target2_id = self.export_data_target.create({ + self.export_data_target.create({ 'name': 'Target 2', 'one2many': export1_id, }) diff --git a/trytond/tests/test_sequence.py b/trytond/tests/test_sequence.py index aa5e44c9f2..15a251a3ea 100644 --- a/trytond/tests/test_sequence.py +++ b/trytond/tests/test_sequence.py @@ -102,7 +102,7 @@ class SequenceTestCase(unittest.TestCase): ''' Test prefix/suffix ''' - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, CONTEXT): sequence_id = self.sequence.create({ 'name': 'Test incremental', 'code': 'test', @@ -117,7 +117,6 @@ class SequenceTestCase(unittest.TestCase): 'prefix': '${year}-${month}-${day}/', 'suffix': '/${day}.${month}.${year}', }) - context = CONTEXT.copy() with Transaction().set_context(date=datetime.date(2010, 8, 15)): self.assertEqual(self.sequence.get_id(sequence_id), '2010-08-15/2/15.08.2010') diff --git a/trytond/tests/test_tools.py b/trytond/tests/test_tools.py index be748c0c1e..5138bec0fd 100644 --- a/trytond/tests/test_tools.py +++ b/trytond/tests/test_tools.py @@ -5,15 +5,10 @@ import unittest import datetime -import socket -import urllib from trytond.config import CONFIG from trytond.tools import reduce_ids, safe_eval, datetime_strftime, \ reduce_domain -from trytond.tests.test_tryton import (POOL, DB_NAME, USER, CONTEXT, - install_module) -from trytond.transaction import Transaction class ToolsTestCase(unittest.TestCase): diff --git a/trytond/tests/test_trigger.py b/trytond/tests/test_trigger.py index fe53103a04..339171c2cf 100644 --- a/trytond/tests/test_trigger.py +++ b/trytond/tests/test_trigger.py @@ -3,7 +3,6 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. import unittest -import sys import time from xmlrpclib import MAXINT try: diff --git a/trytond/tests/test_tryton.py b/trytond/tests/test_tryton.py index ed09b930d0..2f97d0340a 100644 --- a/trytond/tests/test_tryton.py +++ b/trytond/tests/test_tryton.py @@ -14,7 +14,6 @@ import unittest import doctest from lxml import etree import time -import imp import optparse _MODULES = False @@ -201,7 +200,7 @@ def test_depends(): self.fields.add(fname) return super(Encoder, self).default(obj) - with Transaction().start(DB_NAME, USER, CONTEXT) as transaction: + with Transaction().start(DB_NAME, USER, CONTEXT): for mname, model in Pool().iterobject(): for fname, field in model._columns.iteritems(): encoder = Encoder() diff --git a/trytond/tools/misc.py b/trytond/tools/misc.py index c20e264a95..e945c73e0e 100644 --- a/trytond/tools/misc.py +++ b/trytond/tools/misc.py @@ -8,10 +8,6 @@ import os, sys import subprocess from threading import local import smtplib -try: - import cStringIO as StringIO -except ImportError: - import StringIO import dis from decimal import Decimal from trytond.config import CONFIG @@ -302,9 +298,6 @@ class LocalDict(local): def __ge__(self, y): return self._dict.__ge__(y) - def __getitem__(self, y): - return self._dict.__getitem__(y) - def __gt__(self, y): return self._dict.__gt__(y) diff --git a/trytond/webdav/webdav.py b/trytond/webdav/webdav.py index ae7fbb34fa..dabffd26cd 100644 --- a/trytond/webdav/webdav.py +++ b/trytond/webdav/webdav.py @@ -3,7 +3,6 @@ import os import time from trytond.model import ModelView, ModelSQL, fields -from trytond.version import PACKAGE, VERSION, WEBSITE from trytond.tools import reduce_ids, safe_eval from trytond.transaction import Transaction from trytond.pool import Pool diff --git a/trytond/workflow/workflow.py b/trytond/workflow/workflow.py index 8f39e57e10..f3f490e315 100644 --- a/trytond/workflow/workflow.py +++ b/trytond/workflow/workflow.py @@ -1,9 +1,7 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import os from trytond.model import ModelView, ModelSQL, fields from trytond.report import Report -from trytond.tools import exec_command_pipe from trytond.backend import TableHandler from trytond.pyson import Eval, Bool from trytond.transaction import Transaction